Mercurial > hg > syntilista
changeset 263:f0e180b13e05
More build system improvements.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Tue, 14 Jan 2020 03:27:25 +0200 |
| parents | 847917a62ea2 |
| children | 77ca252e445d |
| files | Makefile Makefile.cross-mingw Makefile.gen |
| diffstat | 3 files changed, 10 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Tue Jan 14 03:08:32 2020 +0200 +++ b/Makefile Tue Jan 14 03:27:25 2020 +0200 @@ -13,7 +13,7 @@ PREFIX = /usr/local BINPATH = ./ OBJPATH = obj/unix/ -EXEEXT = +BINEXT = # Compiler flags and linker flags ifeq ($(USE_QTHTTP),yes)
--- a/Makefile.cross-mingw Tue Jan 14 03:08:32 2020 +0200 +++ b/Makefile.cross-mingw Tue Jan 14 03:27:25 2020 +0200 @@ -16,7 +16,7 @@ endif PREFIX = -EXEEXT = .exe +BINEXT = .exe # Miscellaneous QT5_MODULES = Core Gui Widgets Sql PrintSupport
--- a/Makefile.gen Tue Jan 14 03:08:32 2020 +0200 +++ b/Makefile.gen Tue Jan 14 03:27:25 2020 +0200 @@ -31,7 +31,7 @@ # Application stuff APP_IMG=img/ -APP_BIN=$(BINPATH)Syntilista$(EXEEXT) +APP_BIN=$(BINPATH)Syntilista$(BINEXT) APP_HDRS=\ src/main.h \ @@ -82,7 +82,7 @@ else DO_CMD=/bin/echo -E $(3) && $(3) endif -DO_MKDIR=if test ! -d "$(1)"; then mkdir -p "$(1)"; fi +DO_MKDIR=if test ! -z "$(1)" -a ! -d "$(1)"; then /bin/echo -E " MKDIR $(1)"; mkdir -p "$(1)"; fi COMPILE_C_OBJ = \ @@ -115,15 +115,13 @@ moc_predefs.h: @echo "" > $(OBJPATH)dummy.cpp - @$(CXX) $(CXXFLAGS) -dM -E -o $@ $(OBJPATH)dummy.cpp + @$(call DO_CMD,CXX,$@,$(CXX) $(CXXFLAGS) -dM -E -o $@ $(OBJPATH)dummy.cpp) moc_%.cpp: %.h $(QT_MOC_RULES) - @echo " Qt::MOC $@ $<" - @$(QT_MOC) $(DEFINES) $(QT_MOC_FLAGS) $(INCPATH) $< -o $@ + @$(call DO_CMD,Qt:MOC,$@ $<,$(QT_MOC) $(DEFINES) $(QT_MOC_FLAGS) $(INCPATH) $< -o $@) ui_%.h: %.ui - @echo " Qt::UIC $@ $<" - @$(QT_UIC) $(QT_UIC_FLAGS) $< -o $@ + @$(call DO_CMD,Qt:UIC,$@ $<,$(QT_UIC) $(QT_UIC_FLAGS) $< -o $@) $(OBJPATH)%.o: src/%.cpp src/%.h @@ -133,7 +131,6 @@ $(COMPILE_CXX_OBJ) $(DEFINES) $(INCPATH) - ### ### Windows specific rules ### @@ -141,8 +138,7 @@ @sed -e "s/@APP_VERSION@/$(APP_VERSION)/g;s/@APP_VERSION_COM@/$(APP_VERSION_COM)/g;s#@APP_EXE@#$(notdir $(APP_BIN))#g" < $< > $@ $(OBJPATH)%.o: src/%.rc - @echo " WINDRES $<" - @$(WINDRES) $< -O coff -o $@ + @$(call DO_CMD,WINDRES,$<,$(WINDRES) $< -O coff -o $@) ### @@ -161,17 +157,14 @@ convert "$<" -scale "258x220" "$@" icon.ico: $(addprefix $(APP_IMG),$(ICON_PNGS)) - @echo " CONVERT $+ -> $@" - @convert $+ $@ + @$(call DO_CMD,CONVERT,$+ -> $@,convert $+ $@) src/%.cpp: src/%.qrc $(APP_RESOURCES) - @echo " Qt:RCC $@ $<" - @$(QT_RCC) -name "Syntilista" $< -o $@ + @$(call DO_CMD,Qt:RCC,$@ $<,$(QT_RCC) -name "Syntilista" $< -o $@) $(OBJPATH)main.o: src/main.cpp $(APP_HDRS) VERSION $(COMPILE_CXX_OBJ) $(DEFINES) $(INCPATH) - $(APP_BIN): $(addprefix $(OBJPATH),$(APP_OBJS)) $(APP_DEP_LIBS) | $(APP_DEPS) $(LINK_CXX_BIN) $(APP_LIBS)