From: Bradley Nicholes <bnicholes@apache.org>
Date: Wed, 28 Apr 2004 20:40:22 +0000 (+0000)
Subject: Fix the XLFLAGS define in the NetWare makefiles so that the contents are added to... 
X-Git-Tag: pre_ajp_proxy~303
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=77555ba72e2898f479c3697863f370cdb8bd667b;p=apache

Fix the XLFLAGS define in the NetWare makefiles so that the contents are added to the _link.opt file rather than the _link.def file

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 4f32c6e0f3..3e13ee4cd4 100644
--- 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 d8ef0b9295..4082902f7c 100644
--- 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 1386127c0a..99dbc59283 100644
--- 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)
 
 #