Mercurial > hg > dmlib
diff Makefile.gen @ 607:360b1ad83ed9
Rename things; Fix build by combining the conflicting rules.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Fri, 12 Apr 2013 11:21:37 +0300 |
| parents | a0082ce261c8 |
| children | 5df8ef3f88bb |
line wrap: on
line diff
--- a/Makefile.gen Fri Apr 12 11:18:45 2013 +0300 +++ b/Makefile.gen Fri Apr 12 11:21:37 2013 +0300 @@ -301,9 +301,6 @@ @echo " CC $+" @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) -$(OBJPATH)dmsimple.o: $(DMLIB)dmsimple.c $(DMLIB)dmengine.h - @echo " CC $+" - @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) $(OBJPATH)jssmod.o: $(DMLIB)jssmod.c $(DMLIB)jssmod.h $(DMLIB)jss.h @echo " CC $+" @@ -343,10 +340,12 @@ $(DMLIB)setupimage.h: $(DMLIB)graphics/SetupImage.png $(DATA2INC_BIN) -C -n engineSetupImage -t Uint8 $< $@ -$(DMLIB)setupbar.h: $(DMLIB)graphics/SetupMenuBar.png +$(DMLIB)setupmenubar.h: $(DMLIB)graphics/SetupMenuBar.png $(DATA2INC_BIN) -C -n engineSetupMenuBar -t Uint8 $< $@ -$(OBJPATH)dmsimple.o: $(DMLIB)setupbar.h $(DMLIB)setupfont.h $(DMLIB)setupimage.h $(DMLIB)dmsimple.c +$(OBJPATH)dmsimple.o: $(DMLIB)dmsimple.c $(DMLIB)dmengine.h \ + $(DMLIB)setupmenubar.h $(DMLIB)setupfont.h \ + $(DMLIB)setupimage.h $(DMLIB)dmsimple.c @echo " CC $+" @$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)