Fix the XLFLAGS define in the NetWare makefiles so that the contents are added to...

Submitted by: Guenter Knauf <gk@gknw.net>, Brad Nicholes

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

diff --git a/build/NWGNUtail.inc b/build/NWGNUtail.inc
index 4f32c6e0f35f282d84696980321923ac3e4d3320..3e13ee4cd4f9f3a8472ac95b4bcb48db277f7776 100644 (file)
--- a/build/NWGNUtail.inc
+++ b/build/NWGNUtail.inc
@@ -192,8 +192,6 @@ 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
@@ -264,6 +262,9 @@ endif
 ifneq "$(NLM_FLAGS)" ""
        @echo -flags $(NLM_FLAGS) >> $@
 endif
+ifneq "$(strip $(XLFLAGS))" ""
+       @echo $(XLFLAGS) >> $@
+endif
 ifneq "$(strip $(FILES_nlm_objs))" ""
        @echo $(foreach objfile,$(strip $(FILES_nlm_objs)),$(subst /,\,$(objfile))) >> $@
 endif
@@ -286,9 +287,6 @@ endif
 ifneq "$(FILES_nlm_exports)" ""
        @echo Export $(foreach export,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_exports))),$(subst /,\,$(export))) >> $(OBJDIR)\$(NLM_NAME)_link.def
 endif
-ifneq "$(strip $(XLFLAGS))" ""
-       @echo $(XLFLAGS) >> $(OBJDIR)\$(NLM_NAME)_link.def
-endif
 
 # if APACHE_UNIPROC is defined, don't include XDCData
 ifndef APACHE_UNIPROC

diff --git a/modules/dav/fs/NWGNUmakefile b/modules/dav/fs/NWGNUmakefile
index d8ef0b9295ab9e05faee87f6f9c6b3ca63d72c83..4082902f7cf33eb1c163ffd3770adbd8bd695a87 100644 (file)
--- a/modules/dav/fs/NWGNUmakefile
+++ b/modules/dav/fs/NWGNUmakefile
@@ -52,7 +52,6 @@ XDEFINES      += \
 # These flags will be added to the link.opt file
 #
 XLFLAGS                += \
-                       XDCData $(NWOS)\apache.xdc \
                        $(EOLIST)
 
 #

diff --git a/modules/dav/lock/NWGNUmakefile b/modules/dav/lock/NWGNUmakefile
index 1386127c0a103c9942a9240385070212d0f64cd0..99dbc5928312491bcd7f4d15295db27308230661 100644 (file)
--- a/modules/dav/lock/NWGNUmakefile
+++ b/modules/dav/lock/NWGNUmakefile
@@ -51,7 +51,6 @@ XDEFINES      += \
 # These flags will be added to the link.opt file
 #
 XLFLAGS                += \
-                       XDCData $(NWOS)\apache.xdc \
                        $(EOLIST)
 
 #