bnicholes 2004/04/28 15:26:18
Modified: build Tag: APACHE_2_0_BRANCH NWGNUtail.inc
modules/dav/fs Tag: APACHE_2_0_BRANCH NWGNUmakefile
build Tag: APR_0_9_BRANCH NWGNUtail.inc
Log:
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, Brad Nicholes
Revision Changes Path
No revision
No revision
1.4.2.5 +3 -3 httpd-2.0/build/NWGNUtail.inc
Index: NWGNUtail.inc
===================================================================
RCS file: /home/cvs/httpd-2.0/build/NWGNUtail.inc,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -u -r1.4.2.4 -r1.4.2.5
--- NWGNUtail.inc 12 Apr 2004 20:50:54 -0000 1.4.2.4
+++ NWGNUtail.inc 28 Apr 2004 22:26:18 -0000 1.4.2.5
@@ -262,6 +262,9 @@
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
@@ -283,9 +286,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
No revision
No revision
1.3.2.3 +0 -1 httpd-2.0/modules/dav/fs/NWGNUmakefile
Index: NWGNUmakefile
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/dav/fs/NWGNUmakefile,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- NWGNUmakefile 12 Apr 2004 20:50:54 -0000 1.3.2.2
+++ NWGNUmakefile 28 Apr 2004 22:26:18 -0000 1.3.2.3
@@ -51,7 +51,6 @@
# These flags will be added to the link.opt file
#
XLFLAGS += \
- XDCData $(NWOS)\apache.xdc \
$(EOLIST)
#
No revision
No revision
1.6.2.3 +3 -3 apr/build/NWGNUtail.inc
Index: NWGNUtail.inc
===================================================================
RCS file: /home/cvs/apr/build/NWGNUtail.inc,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -r1.6.2.2 -r1.6.2.3
--- NWGNUtail.inc 13 Apr 2004 20:26:40 -0000 1.6.2.2
+++ NWGNUtail.inc 28 Apr 2004 22:26:18 -0000 1.6.2.3
@@ -253,6 +253,9 @@
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
@@ -274,9 +277,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
