From: Bradley Nicholes Date: Tue, 1 Jun 2004 17:48:21 +0000 (+0000) Subject: Eliminate the redundant compiler rules X-Git-Tag: pre_ajp_proxy~207 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=611952767a907134dd0bbb799632e7771744ea41;p=apache Eliminate the redundant compiler rules Submitted by: Guenter Knauf , Brad Nicholes git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103816 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/NWGNUmakefile b/NWGNUmakefile index f6174b0802..869e602ff1 100644 --- a/NWGNUmakefile +++ b/NWGNUmakefile @@ -349,53 +349,9 @@ installdev :: FORCE # Any specialized rules here # -$(OBJDIR)/%.o: server/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt - @echo compiling $< - $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt - -$(OBJDIR)/%.o: modules/arch/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt - @echo compiling $< - $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt - -$(OBJDIR)/%.o: modules/http/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt - @echo compiling $< - $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt - -$(OBJDIR)/%.o: modules/aaa/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt - @echo compiling $< - $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt - -$(OBJDIR)/%.o: modules/mappers/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt - @echo compiling $< - $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt - -$(OBJDIR)/%.o: modules/generators/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt - @echo compiling $< - $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt - -$(OBJDIR)/%.o: modules/metadata/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt - @echo compiling $< - $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt - -$(OBJDIR)/%.o: modules/filters/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt - @echo compiling $< - $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt - -$(OBJDIR)/%.o: modules/loggers/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt - @echo compiling $< - $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt - -$(OBJDIR)/%.o: os/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt - @echo compiling $< - $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt - -$(OBJDIR)/%.o: server/mpm/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt - @echo compiling $< - $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt - -$(OBJDIR)/%.o: srclib/pcre/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt - @echo compiling $< - $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt +vpath %.c server:modules/arch/netware:modules/http:modules/aaa:modules/mappers +vpath %.c modules/generators:modules/metadata:modules/filters:modules/loggers +vpath %.c os/netware:server/mpm/netware:srclib/pcre # # Include the 'tail' makefile that has targets that depend on variables defined diff --git a/modules/dav/fs/NWGNUmakefile b/modules/dav/fs/NWGNUmakefile index 4082902f7c..f4f7704440 100644 --- a/modules/dav/fs/NWGNUmakefile +++ b/modules/dav/fs/NWGNUmakefile @@ -256,9 +256,7 @@ install :: nlms FORCE # Any specialized rules here # -$(OBJDIR)/%.o: ../../arch/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt - @echo compiling $< - $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt +vpath %.c ../../arch/netware # # Include the 'tail' makefile that has targets that depend on variables defined diff --git a/modules/metadata/NWGNUuniqueid b/modules/metadata/NWGNUuniqueid index 51ab90b78b..42078edc95 100644 --- a/modules/metadata/NWGNUuniqueid +++ b/modules/metadata/NWGNUuniqueid @@ -243,9 +243,7 @@ install :: nlms FORCE # Any specialized rules here # -$(OBJDIR)/%.o: ../arch/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt - @echo compiling $< - $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt +vpath %.c ../arch/netware # # Include the 'tail' makefile that has targets that depend on variables defined diff --git a/modules/proxy/NWGNUproxy b/modules/proxy/NWGNUproxy index bc10ce8fa1..d662c03518 100644 --- a/modules/proxy/NWGNUproxy +++ b/modules/proxy/NWGNUproxy @@ -251,9 +251,7 @@ install :: nlms FORCE # Any specialized rules here # -$(OBJDIR)/%.o: ../arch/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt - @echo compiling $< - $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt +vpath %.c ../arch/netware # # Include the 'tail' makefile that has targets that depend on variables defined diff --git a/modules/proxy/NWGNUproxyftp b/modules/proxy/NWGNUproxyftp index 6c73606992..f608b2274c 100644 --- a/modules/proxy/NWGNUproxyftp +++ b/modules/proxy/NWGNUproxyftp @@ -249,9 +249,7 @@ install :: nlms FORCE # Any specialized rules here # -$(OBJDIR)/%.o: ../arch/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt - @echo compiling $< - $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt +vpath %.c ../arch/netware # # Include the 'tail' makefile that has targets that depend on variables defined diff --git a/modules/proxy/NWGNUproxyhtp b/modules/proxy/NWGNUproxyhtp index 66248d94ac..f605a03564 100644 --- a/modules/proxy/NWGNUproxyhtp +++ b/modules/proxy/NWGNUproxyhtp @@ -252,9 +252,7 @@ install :: nlms FORCE # Any specialized rules here # -$(OBJDIR)/%.o: ../arch/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt - @echo compiling $< - $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt +vpath %.c ../arch/netware # # Include the 'tail' makefile that has targets that depend on variables defined