added makefile.debug
merged makefile