From 87fabc6a53ce9b5206626786f1e8fb3117543463 Mon Sep 17 00:00:00 2001 From: rpolzer Date: Mon, 15 Sep 2008 15:22:23 +0000 Subject: [PATCH 1/1] fix make -j git-svn-id: svn://svn.icculus.org/netradiant/trunk@50 61c419a2-8eb2-4b30-bcec-8cead039b335 --- Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index a78411cf..63096843 100644 --- a/Makefile +++ b/Makefile @@ -68,7 +68,6 @@ TEE_STDERR ?= | tee /dev/stderr .PHONY: all all: \ - makeversion \ install/heretic2/h2data.$(EXE) \ install/modules/archivepak.$(DLL) \ install/modules/archivewad.$(DLL) \ @@ -116,10 +115,10 @@ clean: $(CXX) -shared -o $@ $^ $(LDFLAGS) $(LDFLAGS_DLL) $(LIBS) $(LIBS_EXTRA) [ -z "$(LDD)" ] || [ -z "`$(LDD) -r $@ 2>&1 >/dev/null $(TEE_STDERR)`" ] || { $(RM) $@; exit 1; } -%.o: %.cpp +%.o: %.cpp makeversion $(CXX) -c -o $@ $< $(CXXFLAGS) $(CPPFLAGS) $(CPPFLAGS_EXTRA) -%.o: %.c +%.o: %.c makeversion $(CC) -c -o $@ $< $(CFLAGS) $(CPPFLAGS) $(CPPFLAGS_EXTRA) install/q3map2.$(EXE): LIBS_EXTRA := $(LIBS_XML) $(LIBS_GLIB) $(LIBS_PNG) @@ -712,7 +711,7 @@ makeversion: mv_if_diff include/aboutmsg.h.new include/aboutmsg.h .PHONY: install-data -install-data: +install-data: makeversion $(MKDIR) install/games $(FIND) install/ -name .svn -exec $(RM_R) {} \; -prune; \ set -ex; \ -- 2.39.2