From: Rudolf Polzer Date: Sun, 4 Dec 2011 17:19:34 +0000 (+0100) Subject: make dependencies check work even with -j make invocation X-Git-Tag: xonotic-v0.6.0~50 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9e69c83769b44a3ac215b21a44c6a0c1a8560bb1;p=xonotic%2Fnetradiant.git make dependencies check work even with -j make invocation --- diff --git a/Makefile b/Makefile index 8f7d036c..f87dba8b 100644 --- a/Makefile +++ b/Makefile @@ -243,7 +243,6 @@ CPPFLAGS += -DRADIANT_VERSION="\"$(RADIANT_VERSION)\"" -DRADIANT_MAJOR_VERSION=" .PHONY: all all: \ - dependencies-check \ binaries \ install-data \ install-dll \ @@ -447,10 +446,10 @@ ifeq ($(OS),Win32) $(WINDRES) $< $@ endif -%.o: %.cpp $(if $(findstring $(DEPEND_ON_MAKEFILE),yes),$(wildcard Makefile*),) +%.o: %.cpp dependencies-check $(if $(findstring $(DEPEND_ON_MAKEFILE),yes),$(wildcard Makefile*),) $(CXX) $< $(CFLAGS) $(CXXFLAGS) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) $(CPPFLAGS_EXTRA) $(CPPFLAGS_COMMON) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ -%.o: %.c $(if $(findstring $(DEPEND_ON_MAKEFILE),yes),$(wildcard Makefile*),) +%.o: %.c dependencies-check $(if $(findstring $(DEPEND_ON_MAKEFILE),yes),$(wildcard Makefile*),) $(CC) $< $(CFLAGS) $(CFLAGS_COMMON) $(CPPFLAGS_EXTRA) $(CPPFLAGS_COMMON) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@