moved XLFLAGS to the .opt file so that external libs can be added;

added new var XDCDATA and removed xdcdata setting from mis-used XLFLAGS;
moved some copyright from .opt to .def file since -copy option doesnt accept commas.

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

diff --git a/NWGNUtail.inc b/NWGNUtail.inc
index 7d9ade96ed8cc1d7a08ce22d6fdfdd16734c34b4..2e927f4f7216c1566bf58596f0dec3c7cfab5cab 100644 (file)
--- a/NWGNUtail.inc
+++ b/NWGNUtail.inc
@@ -194,12 +194,9 @@ $(OBJDIR)\$(NLM_NAME)_link.opt : $($(NLM_NAME)_LINKOPT_DEPENDS)
        @echo Generating $@
        @echo -warnings off >> $@
        @echo -zerobss >> $@
-       @echo -desc "$(NLM_DESCRIPTION)" >> $@
        @echo -o $(OBJDIR)\$(NLM_NAME).nlm >> $@
 ifneq "$(FILE_nlm_copyright)" ""
        @-type $(FILE_nlm_copyright) >> $@
-else
-       @echo -copy "$(NLM_COPYRIGHT)" >> $@
 endif
 ifeq "$(RELEASE)" "debug"
        @echo -screenname "$(NLM_NAME) Screen" >> $@
@@ -210,19 +207,17 @@ ifeq "$(RELEASE)" "debug"
 else   
        @echo -screenname "Apache for NetWare" >> $@ 
 endif  
-ifneq "$(NLM_VERSION)" ""
-       @echo -nlmversion=$(NLM_VERSION) >> $@ 
-else
-       @echo -nlmversion=$(VERSION) >> $@
-endif
        @echo -l $(NWOS) >> $@
        @echo -l $(AP)\$(OBJDIR) >> $@
        @echo -l $(REGEX)\$(OBJDIR) >> $@
        @echo -l $(STDMOD)\$(OBJDIR) >> $@
        @echo -l $(NWOS)\$(OBJDIR) >> $@
-#      @echo -l $(METROWERKS)\Novell Support\Metrowerks Support\Libraries\Runtime >> $@
+#      @echo -l "$(METROWERKS)\Novell Support\Metrowerks Support\Libraries\Runtime" >> $@
        @echo -l $(NWSDKDIR)\imports >> $@
        @echo -l $(LDAPSDK)\Netware\clib\imports >> $@
+ifneq "$(strip $(XLFLAGS))" ""
+       @echo $(strip $(XLFLAGS)) >> $@
+endif
        @echo -nodefaults >> $@
        @echo -map $(OBJDIR)\$(NLM_NAME).map>> $@
        @echo -threadname "$(NLM_THREAD_NAME)" >> $@
@@ -247,6 +242,15 @@ ifneq "$(FILES_nlm_libs)" ""
        @echo $(foreach libfile, $(notdir $(strip $(FILES_nlm_libs))),-l$(subst /,\,$(libfile))) >> $@
 endif
        @echo -commandfile $(OBJDIR)\$(NLM_NAME)_link.def >> $@
+       @echo Description "$(NLM_DESCRIPTION)" >> $(OBJDIR)\$(NLM_NAME)_link.def
+ifeq "$(FILE_nlm_copyright)" ""
+       @echo Copyright "$(NLM_COPYRIGHT)" >> $(OBJDIR)\$(NLM_NAME)_link.def
+endif
+ifneq "$(NLM_VERSION)" ""
+       @echo Version $(NLM_VERSION) >> $(OBJDIR)\$(NLM_NAME)_link.def 
+else
+       @echo Version $(VERSION) >> $(OBJDIR)\$(NLM_NAME)_link.def
+endif
 ifneq "$(FILE_nlm_msg)" ""
        @echo Messages $(FILE_nlm_msg) >> $(OBJDIR)\$(NLM_NAME)_link.def
 endif
@@ -262,12 +266,9 @@ 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 $(strip $(XLFLAGS)) >> $(OBJDIR)\$(NLM_NAME)_link.def
+ifneq "$(XDCDATA)" ""
+       @echo XDCData $(XDCDATA) >> $(OBJDIR)\$(NLM_NAME)_link.def
 endif
-#ifndef XDCFOUND
-#      @echo XDCData $(NWOS)\apache.xdc >> $(OBJDIR)\$(NLM_NAME)_link.def
-#endif
 
 else # more than one target so look for individual makefiles.
 

diff --git a/src/NWGNUmakefile.mak b/src/NWGNUmakefile.mak
index 3c9b9c889a02b11d66ad4384b836151c4422aaa2..074e53c09f284a5ec9920b7374a7ffa1cd49be6a 100644 (file)
--- a/src/NWGNUmakefile.mak
+++ b/src/NWGNUmakefile.mak
@@ -40,10 +40,8 @@ XLFLAGS              += \
                        $(EOLIST)
 
 ifdef MULTIPROC
-XLFLAGS                += \
-               XDCData $(NWOS)\apache.xdc \
-               $(EOLIST)
-endif                  
+XDCDATA                = $(NWOS)\apache.xdc
+endif
 
 #
 # These values will be appended to the correct variables based on the value of

diff --git a/src/main/NWGNUmakefile.mak b/src/main/NWGNUmakefile.mak
index 45be7474e299de233186f6de1c47e478154613a8..ad66dfa2ef6eb704018d057fba80d23d8c690f22 100644 (file)
--- a/src/main/NWGNUmakefile.mak
+++ b/src/main/NWGNUmakefile.mak
@@ -39,10 +39,8 @@ XLFLAGS              += \
                        $(EOLIST)
 
 ifdef MULTIPROC
-XLFLAGS                += \
-               XDCData $(NWOS)\apache.xdc \
-               $(EOLIST)
-endif                  
+XDCDATA                = $(NWOS)\apache.xdc
+endif
 
 #
 # These values will be appended to the correct variables based on the value of