Allow make files to create a cc.opt compiler options file per NLM rather than a singl...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102876 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/NWGNUmakefile b/NWGNUmakefile
index 397f9fba976e2420def0295ea4d2e47cb20f231b..3d69fd02cd48b08389206727f5443e38578bf334 100644 (file)
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -348,53 +348,53 @@ installdev :: FORCE
 # Any specialized rules here
 #
 
-$(OBJDIR)/%.o: server/%.c $(OBJDIR)\cc.opt
+$(OBJDIR)/%.o: server/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
        @echo compiling $<
-       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
 
-$(OBJDIR)/%.o: modules/arch/netware/%.c $(OBJDIR)\cc.opt
+$(OBJDIR)/%.o: modules/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
 
-$(OBJDIR)/%.o: modules/http/%.c $(OBJDIR)\cc.opt
+$(OBJDIR)/%.o: modules/http/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
        @echo compiling $<
-       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
 
-$(OBJDIR)/%.o: modules/aaa/%.c $(OBJDIR)\cc.opt
+$(OBJDIR)/%.o: modules/aaa/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
        @echo compiling $<
-       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
 
-$(OBJDIR)/%.o: modules/mappers/%.c $(OBJDIR)\cc.opt
+$(OBJDIR)/%.o: modules/mappers/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
        @echo compiling $<
-       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
 
-$(OBJDIR)/%.o: modules/generators/%.c $(OBJDIR)\cc.opt
+$(OBJDIR)/%.o: modules/generators/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
        @echo compiling $<
-       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
 
-$(OBJDIR)/%.o: modules/metadata/%.c $(OBJDIR)\cc.opt
+$(OBJDIR)/%.o: modules/metadata/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
        @echo compiling $<
-       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
 
-$(OBJDIR)/%.o: modules/filters/%.c $(OBJDIR)\cc.opt
+$(OBJDIR)/%.o: modules/filters/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
        @echo compiling $<
-       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
 
-$(OBJDIR)/%.o: modules/loggers/%.c $(OBJDIR)\cc.opt
+$(OBJDIR)/%.o: modules/loggers/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
        @echo compiling $<
-       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
 
-$(OBJDIR)/%.o: os/netware/%.c $(OBJDIR)\cc.opt
+$(OBJDIR)/%.o: os/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
 
-$(OBJDIR)/%.o: server/mpm/netware/%.c $(OBJDIR)\cc.opt
+$(OBJDIR)/%.o: server/mpm/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
 
-$(OBJDIR)/%.o: srclib/pcre/%.c $(OBJDIR)\cc.opt
+$(OBJDIR)/%.o: srclib/pcre/%.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/build/NWGNUtail.inc b/build/NWGNUtail.inc
index 234309ef0d58c0d5cdbbfe94b3eebe0c9d59d7ca..4f32c6e0f35f282d84696980321923ac3e4d3320 100644 (file)
--- a/build/NWGNUtail.inc
+++ b/build/NWGNUtail.inc
@@ -96,11 +96,13 @@ VERSION_STR = 2.0.0
 endif
 
 
-$(OBJDIR)/%.o: %.c $(OBJDIR)\cc.opt
+ifeq "$(words $(strip $(TARGET_nlm)))" "1"
+
+$(OBJDIR)/%.o: %.c $(OBJDIR)\$(NLM_NAME)_cc.opt
        @echo Compiling $<
-       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cc.opt
+       $(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
 
-$(OBJDIR)\cc.opt: $(CCOPT_DEPENDS)
+$(OBJDIR)\$(NLM_NAME)_cc.opt: $(CCOPT_DEPENDS)
        $(CHK) $@ $(DEL) $@
        @echo Generating $@
 ifneq "$(strip $(CFLAGS))" ""
@@ -148,6 +150,8 @@ ifneq "$(strip $(XDEFINES))" ""
        @echo $(XDEFINES) >> $@
 endif
 
+endif # one target nlm
+
 #
 # Rules to build libraries
 #
@@ -188,6 +192,8 @@ ifeq "$(words $(strip $(TARGET_nlm)))" "1"
 $(TARGET_nlm) : $(FILES_nlm_objs) $(FILES_nlm_libs) $(OBJDIR)\$(NLM_NAME)_link.opt
        @echo Linking $@
        $(LINK) @$(OBJDIR)\$(NLM_NAME)_link.opt
+        
+#      $(CHK) $(OBJDIR)\cc.opt $(DEL) $(OBJDIR)\cc.opt
 
 # This will force the link option file to be rebuilt if we change the
 # corresponding makefile

diff --git a/modules/dav/fs/NWGNUmakefile b/modules/dav/fs/NWGNUmakefile
index 94a274f2f4e0be67ef27979f7b0e3b92b294fb0f..d8ef0b9295ab9e05faee87f6f9c6b3ca63d72c83 100644 (file)
--- 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 b39035d660c5fa850364ec97b1bf1d4a65ad6913..2ec80c7a45cf8f513e00e083f017f8d1937a9fef 100644 (file)
--- 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 f30053848ab7a4e6936eac233835a1aac30863e3..51ab90b78b50bd176ca0c260b698dc04d189e2fe 100644 (file)
--- 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 55c2339764ac5f340d8da8a85e82e2019ca1f6af..bc10ce8fa1daac26656fe599726157fd6f06ff07 100644 (file)
--- 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 4c7d9471971cba3a400175df4de7a5ac7c8363da..6c736069924f5187cfc330f0b39a625be9d0ea5d 100644 (file)
--- 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 ac761232adc28d6e51961ce1a37c684571deb87f..66248d94ac88648e5395dfd68d6123f38f6016ee 100644 (file)
--- 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