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

Submitted by: Guenter Knauf, Brad Nicholes

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

diff --git a/build/NWGNUtail.inc b/build/NWGNUtail.inc
index 7c56ec54f765b36ff610c417237b536642bb9f63..3e13ee4cd4f9f3a8472ac95b4bcb48db277f7776 100644 (file)
--- a/build/NWGNUtail.inc
+++ b/build/NWGNUtail.inc
@@ -262,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
@@ -284,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 548a84ba68cfb9a05a8fc8a098af3475563a7eab..f37cb18278ea3685771e41c6ae5f1c6871e85577 100644 (file)
--- a/modules/dav/fs/NWGNUmakefile
+++ b/modules/dav/fs/NWGNUmakefile
@@ -51,7 +51,6 @@ XDEFINES      += \
 # These flags will be added to the link.opt file
 #
 XLFLAGS                += \
-                       XDCData $(NWOS)\apache.xdc \
                        $(EOLIST)
 
 #