comparison Makefile.gen @ 2529:fddee4b6a427

Do not have config.mak in build depencies when it is not being used.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 16 May 2020 06:11:53 +0300
parents ba8b44cd313b
children 72513168d94e
comparison
equal deleted inserted replaced
2528:b3b6d82247f5 2529:fddee4b6a427
2 ### Get settings from config.mak or other include 2 ### Get settings from config.mak or other include
3 ### 3 ###
4 ifneq ($(DM_CONFIG),) 4 ifneq ($(DM_CONFIG),)
5 ifneq ($(DM_CONFIG),no) 5 ifneq ($(DM_CONFIG),no)
6 include $(DM_CONFIG) 6 include $(DM_CONFIG)
7 else
8 DM_CONFIG=
7 endif 9 endif
8 else 10 else
9 include config.mak 11 include config.mak
12 DM_CONFIG=config.mak
10 endif 13 endif
11 14
12 15
13 ### 16 ###
14 ### Compiler flags 17 ### Compiler flags
453 $(OBJPATH)dmsimple.o: $(addprefix $(DMLIB_SRC), dmsimple.c dmengine.h \ 456 $(OBJPATH)dmsimple.o: $(addprefix $(DMLIB_SRC), dmsimple.c dmengine.h \
454 setupmenubar.h setupfont.h setupimage.h dmsimple.c) 457 setupmenubar.h setupfont.h setupimage.h dmsimple.c)
455 $(COMPILE_C_OBJ) 458 $(COMPILE_C_OBJ)
456 459
457 460
458 $(DMLIB_A): $(addprefix $(OBJPATH),$(DMLIB_OBJS)) $(DMLIB)Makefile.gen config.mak 461 $(DMLIB_A): $(addprefix $(OBJPATH),$(DMLIB_OBJS)) $(DMLIB)Makefile.gen $(DM_CONFIG)
459 $(LINK_STATIC_LIB) 462 $(LINK_STATIC_LIB)
460 463
461 464
462 ### 465 ###
463 ### Tests 466 ### Tests
525 528
526 529
527 ### 530 ###
528 ### Editor targets 531 ### Editor targets
529 ### 532 ###
530 $(EDITOR_PRO): $(DMLIB)Makefile.gen config.mak $(addprefix $(DMLIB),$(EDITOR_SOURCES) $(EDITOR_HEADERS)) $(addprefix $(OBJPATH),$(DEMO_OBJS)) $(DMLIB_A) 533 $(EDITOR_PRO): $(DMLIB)Makefile.gen $(DM_CONFIG) $(addprefix $(DMLIB),$(EDITOR_SOURCES) $(EDITOR_HEADERS)) $(addprefix $(OBJPATH),$(DEMO_OBJS)) $(DMLIB_A)
531 @echo " CREATE $@" 534 @echo " CREATE $@"
532 @echo "OBJECTS_DIR = $(OBJPATH)" > $@ 535 @echo "OBJECTS_DIR = $(OBJPATH)" > $@
533 @echo "MOC_DIR = $(OBJPATH)" >> $@ 536 @echo "MOC_DIR = $(OBJPATH)" >> $@
534 @echo "QMAKE_CXXFLAGS += $(DM_CFLAGS) $(SDL_CFLAGS)" >> $@ 537 @echo "QMAKE_CXXFLAGS += $(DM_CFLAGS) $(SDL_CFLAGS)" >> $@
535 @echo "QMAKE_LIBS += $(filter-out %dmsimple.o,$(filter %.o %.a,$+))" >> $@ 538 @echo "QMAKE_LIBS += $(filter-out %dmsimple.o,$(filter %.o %.a,$+))" >> $@