diff options
| author | Bradley Nicholes <bnicholes@apache.org> | 2004-03-07 04:04:51 +0100 |
|---|---|---|
| committer | Bradley Nicholes <bnicholes@apache.org> | 2004-03-07 04:04:51 +0100 |
| commit | c7174f4244325255fe8bc0bc43e64ac1371880b1 (patch) | |
| tree | bedc4d39ee5932c5ecbddc657564b573e3a03917 /modules | |
| parent | Add the include path to modules/ssl to resolve the include of mod_ssl.h (diff) | |
| download | apache2-c7174f4244325255fe8bc0bc43e64ac1371880b1.tar.xz apache2-c7174f4244325255fe8bc0bc43e64ac1371880b1.zip | |
Allow make files to create a cc.opt compiler options file per NLM rather than a single file per directory
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102876 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/dav/fs/NWGNUmakefile | 5 | ||||
| -rw-r--r-- | modules/filters/NWGNUdeflate | 4 | ||||
| -rw-r--r-- | modules/metadata/NWGNUuniqueid | 4 | ||||
| -rw-r--r-- | modules/proxy/NWGNUproxy | 4 | ||||
| -rw-r--r-- | modules/proxy/NWGNUproxyftp | 4 | ||||
| -rw-r--r-- | modules/proxy/NWGNUproxyhtp | 4 |
6 files changed, 13 insertions, 12 deletions
diff --git a/modules/dav/fs/NWGNUmakefile b/modules/dav/fs/NWGNUmakefile index 94a274f2f4..d8ef0b9295 100644 --- a/modules/dav/fs/NWGNUmakefile +++ b/modules/dav/fs/NWGNUmakefile @@ -32,6 +32,7 @@ XINCDIRS += \ $(AP_WORK)/server/mpm/NetWare \ $(AP_WORK)/srclib/pcre \ $(AP_WORK)/modules/dav/main \ + $(AP_WORK)/modules/arch/netware \ $(NWOS) \ $(EOLIST) @@ -256,9 +257,9 @@ install :: nlms FORCE # Any specialized rules here # -$(OBJDIR)/%.o: ../../arch/netware/%.c $(OBJDIR)\cc.opt +$(OBJDIR)/%.o: ../../arch/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt @echo compiling $< - $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt + $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt # # Include the 'tail' makefile that has targets that depend on variables defined diff --git a/modules/filters/NWGNUdeflate b/modules/filters/NWGNUdeflate index b39035d660..2ec80c7a45 100644 --- a/modules/filters/NWGNUdeflate +++ b/modules/filters/NWGNUdeflate @@ -265,9 +265,9 @@ install :: nlms FORCE # ifneq "$(ZLIBSDK)" "" -$(OBJDIR)/%.o: $(ZLIBSDK)/%.c $(OBJDIR)\cc.opt +$(OBJDIR)/%.o: $(ZLIBSDK)/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt @echo Compiling $< - $(CC) $(ZLIBSDK)\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt + $(CC) $(ZLIBSDK)\$(<F) -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt endif # diff --git a/modules/metadata/NWGNUuniqueid b/modules/metadata/NWGNUuniqueid index f30053848a..51ab90b78b 100644 --- a/modules/metadata/NWGNUuniqueid +++ b/modules/metadata/NWGNUuniqueid @@ -243,9 +243,9 @@ install :: nlms FORCE # Any specialized rules here # -$(OBJDIR)/%.o: ../arch/netware/%.c $(OBJDIR)\cc.opt +$(OBJDIR)/%.o: ../arch/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt @echo compiling $< - $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt + $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt # # Include the 'tail' makefile that has targets that depend on variables defined diff --git a/modules/proxy/NWGNUproxy b/modules/proxy/NWGNUproxy index 55c2339764..bc10ce8fa1 100644 --- a/modules/proxy/NWGNUproxy +++ b/modules/proxy/NWGNUproxy @@ -251,9 +251,9 @@ install :: nlms FORCE # Any specialized rules here # -$(OBJDIR)/%.o: ../arch/netware/%.c $(OBJDIR)\cc.opt +$(OBJDIR)/%.o: ../arch/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt @echo compiling $< - $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt + $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt # # Include the 'tail' makefile that has targets that depend on variables defined diff --git a/modules/proxy/NWGNUproxyftp b/modules/proxy/NWGNUproxyftp index 4c7d947197..6c73606992 100644 --- a/modules/proxy/NWGNUproxyftp +++ b/modules/proxy/NWGNUproxyftp @@ -249,9 +249,9 @@ install :: nlms FORCE # Any specialized rules here # -$(OBJDIR)/%.o: ../arch/netware/%.c $(OBJDIR)\cc.opt +$(OBJDIR)/%.o: ../arch/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt @echo compiling $< - $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt + $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt # # Include the 'tail' makefile that has targets that depend on variables defined diff --git a/modules/proxy/NWGNUproxyhtp b/modules/proxy/NWGNUproxyhtp index ac761232ad..66248d94ac 100644 --- a/modules/proxy/NWGNUproxyhtp +++ b/modules/proxy/NWGNUproxyhtp @@ -252,9 +252,9 @@ install :: nlms FORCE # Any specialized rules here # -$(OBJDIR)/%.o: ../arch/netware/%.c $(OBJDIR)\cc.opt +$(OBJDIR)/%.o: ../arch/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt @echo compiling $< - $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt + $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt # # Include the 'tail' makefile that has targets that depend on variables defined |