svn commit: r526615 - /apr/apr/trunk/build/NWGNUtail.inc

[fu...@apache.org]

Author: fuankg
Date: Sun Apr  8 16:18:10 2007
New Revision: 526615

URL: http://svn.apache.org/viewvc?view=rev&rev=526615
Log:
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.

Modified:
    apr/apr/trunk/build/NWGNUtail.inc

Modified: apr/apr/trunk/build/NWGNUtail.inc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUtail.inc?view=diff&rev=526615&r1=526614&r2=526615
==============================================================================
--- apr/apr/trunk/build/NWGNUtail.inc (original)
+++ apr/apr/trunk/build/NWGNUtail.inc Sun Apr  8 16:18:10 2007
@@ -25,7 +25,7 @@
 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
 
 #
@@ -211,12 +211,9 @@
 	@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 >> $@
@@ -226,12 +223,6 @@
 else
 	@echo -sym internal >> $@
 endif
-	@echo -screenname "$(NLM_SCREEN_NAME)" >> $@
-ifneq "$(NLM_VERSION)" ""
-	@echo -nlmversion=$(NLM_VERSION) >> $@
-else
-	@echo -nlmversion=$(VERSION) >> $@
-endif
 	@echo -l $(APR)/$(OBJDIR) >> $@
 	@echo -l $(APRUTIL)/$(OBJDIR) >> $@
 	@echo -l $(APULDAP)/$(OBJDIR) >> $@
@@ -241,30 +232,12 @@
 ifneq "$(IPV6)" ""
 	@echo -l $(NOVELLLIBC)\include\winsock\IPV6 >> $@
 endif
-		@echo -l $(NOVELLLIBC)/imports >> $@
+	@echo -l $(NOVELLLIBC)/imports >> $@
 ifneq "$(LDAPSDK)" ""
 	@echo -l $(LDAPSDK)/lib/nlm >> $@
 endif
 	@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
@@ -275,28 +248,58 @@
 	@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 $(APR)\misc\netware\apr.xdc >> $(OBJDIR)\$(NLM_NAME)_link.def
+	@echo xdcdata $(APR)\misc\netware\apr.xdc >> $(OBJDIR)\$(NLM_NAME)_link.def
 endif
 endif