moved a couple of options to the generated def file since -copy option seems broken;

this makes the def file also compatible to other NLM linkers.

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

diff --git a/build/NWGNUtail.inc b/build/NWGNUtail.inc
index b32c793f362cf82a4e582c6ab3e85ee364100637..e84babaa0994da198358022663c6ef2d23ec9deb 100644 (file)
--- a/build/NWGNUtail.inc
+++ b/build/NWGNUtail.inc
@@ -25,7 +25,7 @@ NLM_SCREEN_NAME = DEFAULT
 endif
 
 ifndef NLM_COPYRIGHT
-NLM_COPYRIGHT = Licensed under the Apache License Version 2.0
+NLM_COPYRIGHT = Licensed under the Apache License, Version 2.0
 endif
 
 #
@@ -202,12 +202,9 @@ $(OBJDIR)\$(NLM_NAME)_link.opt : $($(NLM_NAME)_LINKOPT_DEPENDS)
        @echo Generating $@
        @echo -warnings off >> $@
        @echo -zerobss >> $@
-       @echo -desc "$(NLM_DESCRIPTION)" >> $@
        @echo -o $(TARGET_nlm) >> $@
 ifneq "$(FILE_nlm_copyright)" ""
        @-type $(FILE_nlm_copyright) >> $@
-else
-       @echo -copy "$(NLM_COPYRIGHT)" >> $@
 endif
 ifeq "$(RELEASE)" "debug"
        @echo -g >> $@
@@ -216,12 +213,6 @@ ifeq "$(RELEASE)" "debug"
        @echo -osym $(OBJDIR)\$(NLM_NAME).sym >> $@
 else
        @echo -sym internal >> $@
-endif
-       @echo -screenname "$(NLM_SCREEN_NAME)" >> $@
-ifneq "$(NLM_VERSION)" ""
-       @echo -nlmversion=$(NLM_VERSION) >> $@
-else
-       @echo -nlmversion=$(VERSION) >> $@
 endif
        @echo -l $(NWOS) >> $@
        @echo -l $(AP)/$(OBJDIR) >> $@
@@ -245,24 +236,6 @@ endif
        @echo -l $(XML)/$(OBJDIR) >> $@
        @echo -nodefaults >> $@
        @echo -map $(OBJDIR)\$(NLM_NAME).map>> $@
-       @echo -threadname "$(NLM_THREAD_NAME)" >> $@
-ifneq "$(NLM_STACK_SIZE)" ""
-       @echo -stacksize $(subst K,000,$(subst k,K,$(strip $(NLM_STACK_SIZE)))) >> $@
-else
-       @echo -stacksize 64000 >> $@
-endif
-ifneq "$(NLM_ENTRY_SYM)" ""
-       @echo -entry $(NLM_ENTRY_SYM) >> $@
-endif
-ifneq "$(NLM_EXIT_SYM)" ""
-       @echo -exit $(NLM_EXIT_SYM) >> $@
-endif
-ifneq "$(NLM_CHECK_SYM)" ""
-       @echo -check $(NLM_CHECK_SYM) >> $@
-endif
-ifneq "$(NLM_FLAGS)" ""
-       @echo -flags $(NLM_FLAGS) >> $@
-endif
 ifneq "$(strip $(XLFLAGS))" ""
        @echo $(XLFLAGS) >> $@
 endif
@@ -273,28 +246,58 @@ ifneq "$(FILES_nlm_libs)" ""
        @echo $(foreach libfile, $(notdir $(strip $(FILES_nlm_libs))),-l$(subst /,\,$(libfile))) >> $@
 endif
        @echo -commandfile $(OBJDIR)\$(NLM_NAME)_link.def >> $@
+       @echo # Do not edit this file - it is created by make! > $(OBJDIR)\$(NLM_NAME)_link.def 
+       @echo # All your changes will be lost!! >> $(OBJDIR)\$(NLM_NAME)_link.def 
 ifneq "$(FILE_nlm_msg)" ""
        @echo Messages $(FILE_nlm_msg) >> $(OBJDIR)\$(NLM_NAME)_link.def
 endif
 ifneq "$(FILE_nlm_hlp)" ""
        @echo Help $(FILE_nlm_hlp) >> $(OBJDIR)\$(NLM_NAME)_link.def
 endif
+ifeq "$(FILE_nlm_copyright)" ""
+       @echo copyright "$(NLM_COPYRIGHT)" >> $(OBJDIR)\$(NLM_NAME)_link.def
+endif
+       @echo description "$(NLM_DESCRIPTION)" >> $(OBJDIR)\$(NLM_NAME)_link.def
+       @echo threadname "$(NLM_THREAD_NAME)" >> $(OBJDIR)\$(NLM_NAME)_link.def
+ifneq "$(NLM_STACK_SIZE)" ""
+       @echo stacksize $(subst K,000,$(subst k,K,$(strip $(NLM_STACK_SIZE)))) >> $(OBJDIR)\$(NLM_NAME)_link.def
+else
+       @echo stacksize 64000 >> $(OBJDIR)\$(NLM_NAME)_link.def
+endif
+       @echo screenname "$(NLM_SCREEN_NAME)" >> $(OBJDIR)\$(NLM_NAME)_link.def
+ifneq "$(NLM_VERSION)" ""
+       @echo version $(NLM_VERSION) >> $(OBJDIR)\$(NLM_NAME)_link.def
+else
+       @echo version $(VERSION) >> $(OBJDIR)\$(NLM_NAME)_link.def
+endif
+ifneq "$(NLM_ENTRY_SYM)" ""
+       @echo start $(NLM_ENTRY_SYM) >> $(OBJDIR)\$(NLM_NAME)_link.def
+endif
+ifneq "$(NLM_EXIT_SYM)" ""
+       @echo exit $(NLM_EXIT_SYM) >> $(OBJDIR)\$(NLM_NAME)_link.def
+endif
+ifneq "$(NLM_CHECK_SYM)" ""
+       @echo check $(NLM_CHECK_SYM) >> $(OBJDIR)\$(NLM_NAME)_link.def
+endif
+ifneq "$(NLM_FLAGS)" ""
+       @echo $(strip $(NLM_FLAGS)) >> $(OBJDIR)\$(NLM_NAME)_link.def
+endif
 ifneq "$(FILES_nlm_modules)" ""
        @echo module $(foreach module,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_modules))),$(subst /,\,$(module))) >> $(OBJDIR)\$(NLM_NAME)_link.def
 endif
 ifneq "$(FILES_nlm_Ximports)" ""
-       @echo Import $(foreach import,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_Ximports))),$(subst /,\,$(import))) >> $(OBJDIR)\$(NLM_NAME)_link.def
+       @echo import $(foreach import,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_Ximports))),$(subst /,\,$(import))) >> $(OBJDIR)\$(NLM_NAME)_link.def
 endif
 ifneq "$(FILES_nlm_exports)" ""
-       @echo Export $(foreach export,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_exports))),$(subst /,\,$(export))) >> $(OBJDIR)\$(NLM_NAME)_link.def
+       @echo export $(foreach export,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_exports))),$(subst /,\,$(export))) >> $(OBJDIR)\$(NLM_NAME)_link.def
 endif
 
 # if APACHE_UNIPROC is defined, don't include XDCData
 ifndef APACHE_UNIPROC
 ifneq "$(string $(XDCDATA))" ""
-       @echo XDCData $(XDCDATA) >> $(OBJDIR)\$(NLM_NAME)_link.def
+       @echo xdcdata $(XDCDATA) >> $(OBJDIR)\$(NLM_NAME)_link.def
 else
-       @echo XDCData $(NWOS)\apache.xdc >> $(OBJDIR)\$(NLM_NAME)_link.def
+       @echo xdcdata $(NWOS)\apache.xdc >> $(OBJDIR)\$(NLM_NAME)_link.def
 endif
 endif