# HG changeset patch # User Matti Hamalainen # Date 1530325285 -10800 # Node ID a36ccc128a628583f59002a2634f97126f97c3f7 # Parent 663a8a73cccd2b9b20d40abd19f75b685169a79d Improve build by making PPL depend on the generated font data. The dependency is a bit ugly though. diff -r 663a8a73cccd -r a36ccc128a62 Makefile.gen --- a/Makefile.gen Sat Jun 30 03:47:35 2018 +0300 +++ b/Makefile.gen Sat Jun 30 05:21:25 2018 +0300 @@ -275,8 +275,8 @@ TESTS_BINARIES += vecmattest fptest dzlibtest endif -FONTCONV_BIN=fontconv -DATA2INC_BIN=data2inc +FONTCONV_BIN=$(TOOL_BINPATH)fontconv +DATA2INC_BIN=$(TOOL_BINPATH)data2inc ### @@ -481,7 +481,11 @@ @echo " LINK $+" @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(TOOL_LDFLAGS) $(ZLIB_LDFLAGS) -$(TOOL_BINPATH)ppl$(EXEEXT): $(DMLIBSRC)setupfont.h $(OBJPATH)ppl.o $(OBJPATH)libgutil.o $(DMLIB_A) +$(OBJPATH)ppl.o: $(TOOL_BINPATH)ppl.c $(MINIJSS)jssplr.h $(MINIJSS)jss.h $(MINIJSS)jssmod.h $(MINIJSS)jssmix.h $(DMLIBSRC)setupfont.h + @echo " CC $+" + @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) + +$(TOOL_BINPATH)ppl$(EXEEXT): $(OBJPATH)ppl.o $(OBJPATH)libgutil.o $(DMLIB_A) @echo " LINK $+" @$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(ZLIB_LDFLAGS) $(SDL_LDFLAGS) -lm