# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1366089200 -10800
# Node ID f9a3b0e8f0fc2cf0fa925efab9ae06cbbbc4acd1
# Parent  81f50da921e5a15e801d3ff06092575f0dfe7369
Clean up build system a bit.

diff -r 81f50da921e5 -r f9a3b0e8f0fc Makefile.gen
--- a/Makefile.gen	Tue Apr 16 07:46:07 2013 +0300
+++ b/Makefile.gen	Tue Apr 16 08:13:20 2013 +0300
@@ -276,7 +276,8 @@
 ###
 $(OBJPATH)%.d: $(DMLIB)%.c
 	@echo > $@
-	@grep '#\s*include\s*\"' $< | sed 's/#\s*include\s\s*"\(.*\)"/\1/' | while read i; do if test -e "$$i"; then echo "$$i" >> $@; fi; done
+	@grep '#\s*include\s*\"' $< | sed 's/#\s*include\s\s*"\(.*\)"/\1/' | \
+	while read i; do if test -e "$$i"; then echo "$$i" >> $@; fi; done
 
 
 $(OBJPATH)%.o: $(MINIJSS)%.c $(MINIJSS)%.h
@@ -393,7 +394,7 @@
 
 
 ###
-### Tests and binaries
+### Tests
 ###
 $(BINPATH)blittest$(EXEEXT): $(OBJPATH)blittest.o $(DMLIB_A)
 	@echo " LINK $+"
@@ -416,6 +417,17 @@
 	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS)
 
 
+###
+### Tools
+###
+$(FONTCONV_BIN): $(OBJPATH)fontconv.o $(DMLIB_A)
+	@echo " LINK $+"
+	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) -lSDL_ttf
+
+$(DATA2INC_BIN): $(OBJPATH)data2inc.o $(DMLIB_A)
+	@echo " LINK $+"
+	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS)
+
 $(BINPATH)packed$(EXEEXT): $(OBJPATH)packed.o $(DMLIB_A)
 	@echo " LINK $+"
 	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS)
@@ -432,30 +444,14 @@
 	@echo " LINK $+"
 	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS)
 
-
-$(FONTCONV_BIN): $(OBJPATH)fontconv.o $(DMLIB_A)
-	@echo " LINK $+"
-	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) -lSDL_ttf
-
-
 $(BINPATH)ppl$(EXEEXT): $(DMLIB)setupfont.h $(OBJPATH)ppl.o $(DMLIB_A) 
 	@echo " LINK $+"
 	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS)
 
-
-$(BINPATH)$(DEMO_BIN)$(EXEEXT): $(addprefix $(OBJPATH),$(DEMO_OBJS)) $(DMLIB_A)
-	@echo " LINK $+"
-	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS)
-
-
 $(BINPATH)objlink$(EXEEXT): $(OBJPATH)objlink.o $(DMLIB_A)
 	@echo " LINK $+"
 	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS)
 
-$(DATA2INC_BIN): $(OBJPATH)data2inc.o $(DMLIB_A)
-	@echo " LINK $+"
-	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS)
-
 $(BINPATH)gfxconv$(EXEEXT): $(OBJPATH)gfxconv.o $(DMLIB_A)
 	@echo " LINK $+"
 	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(LIBPNG_LDFLAGS) $(ZLIB_LDFLAGS)
@@ -470,6 +466,14 @@
 
 
 ###
+### Demo binary
+###
+$(BINPATH)$(DEMO_BIN)$(EXEEXT): $(addprefix $(OBJPATH),$(DEMO_OBJS)) $(DMLIB_A)
+	@echo " LINK $+"
+	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS)
+
+
+###
 ### Editor targets
 ###
 $(EDITOR_PRO): $(DMLIB)Makefile.gen config.mak $(addprefix $(DMLIB),$(EDITOR_SOURCES) $(EDITOR_HEADERS)) $(addprefix $(OBJPATH),$(DEMO_OBJS)) $(DMLIB_A)