httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r531666 - in /httpd/httpd/branches/1.3.x: NWGNUtail.inc src/NWGNUmakefile.mak src/main/NWGNUmakefile.mak
Date Tue, 24 Apr 2007 00:08:51 GMT
Author: fuankg
Date: Mon Apr 23 17:08:50 2007
New Revision: 531666

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

Modified:
    httpd/httpd/branches/1.3.x/NWGNUtail.inc
    httpd/httpd/branches/1.3.x/src/NWGNUmakefile.mak
    httpd/httpd/branches/1.3.x/src/main/NWGNUmakefile.mak

Modified: httpd/httpd/branches/1.3.x/NWGNUtail.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/1.3.x/NWGNUtail.inc?view=diff&rev=531666&r1=531665&r2=531666
==============================================================================
--- httpd/httpd/branches/1.3.x/NWGNUtail.inc (original)
+++ httpd/httpd/branches/1.3.x/NWGNUtail.inc Mon Apr 23 17:08:50 2007
@@ -194,12 +194,9 @@
 	@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 @@
 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 @@
 	@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 @@
 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.
 

Modified: httpd/httpd/branches/1.3.x/src/NWGNUmakefile.mak
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/1.3.x/src/NWGNUmakefile.mak?view=diff&rev=531666&r1=531665&r2=531666
==============================================================================
--- httpd/httpd/branches/1.3.x/src/NWGNUmakefile.mak (original)
+++ httpd/httpd/branches/1.3.x/src/NWGNUmakefile.mak Mon Apr 23 17:08:50 2007
@@ -40,10 +40,8 @@
 			$(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

Modified: httpd/httpd/branches/1.3.x/src/main/NWGNUmakefile.mak
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/1.3.x/src/main/NWGNUmakefile.mak?view=diff&rev=531666&r1=531665&r2=531666
==============================================================================
--- httpd/httpd/branches/1.3.x/src/main/NWGNUmakefile.mak (original)
+++ httpd/httpd/branches/1.3.x/src/main/NWGNUmakefile.mak Mon Apr 23 17:08:50 2007
@@ -39,10 +39,8 @@
 			$(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



Mime
View raw message