makefile changes
merged Makefile.linux