Improving the make file to be very generic