apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r789172 - in /apr/apr/trunk: ./ build/ dbd/ dbm/ ldap/ test/
Date Sun, 28 Jun 2009 23:15:11 GMT
Author: fuankg
Date: Sun Jun 28 23:15:11 2009
New Revision: 789172

URL: http://svn.apache.org/viewvc?rev=789172&view=rev
Log:
more NetWare build tweaks.

Modified:
    apr/apr/trunk/NWGNUmakefile
    apr/apr/trunk/build/NWGNUenvironment.inc
    apr/apr/trunk/build/NWGNUmakefile
    apr/apr/trunk/dbd/NWGNUdbdfreetds
    apr/apr/trunk/dbd/NWGNUdbdmysql
    apr/apr/trunk/dbd/NWGNUdbdpgsql
    apr/apr/trunk/dbd/NWGNUdbdsqli2
    apr/apr/trunk/dbd/NWGNUdbdsqli3
    apr/apr/trunk/dbd/NWGNUmakefile
    apr/apr/trunk/dbm/NWGNUdbmdb
    apr/apr/trunk/dbm/NWGNUdbmgdbm
    apr/apr/trunk/dbm/NWGNUmakefile
    apr/apr/trunk/ldap/NWGNUmakefile
    apr/apr/trunk/test/NWGNUaprtest
    apr/apr/trunk/test/NWGNUmakefile
    apr/apr/trunk/test/NWGNUproc_child
    apr/apr/trunk/test/NWGNUreadchild
    apr/apr/trunk/test/NWGNUsockchild
    apr/apr/trunk/test/NWGNUtestatmc
    apr/apr/trunk/test/NWGNUtryread

Modified: apr/apr/trunk/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/trunk/NWGNUmakefile?rev=789172&r1=789171&r2=789172&view=diff
==============================================================================
--- apr/apr/trunk/NWGNUmakefile (original)
+++ apr/apr/trunk/NWGNUmakefile Sun Jun 28 23:15:11 2009
@@ -174,7 +174,7 @@
 # If there is an NLM target, put it here
 #
 TARGET_nlm = \
-	$(OBJDIR)/aprlib.nlm \
+	$(OBJDIR)/$(NLM_NAME).nlm \
 	$(EOLIST)
 
 #
@@ -397,21 +397,21 @@
 # correct place.  (See $(APR_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms $(INSTDIRS) FORCE
-	copy $(TARGET_nlm)                                 $(INSTALLBASE)\*.*
+	$(CP) $(subst /,\,$(APR)\$(TARGET_nlm))             $(INSTALLBASE)\*.*
 ifndef DEST
-	-copy $(subst /,\,$(APR))\STATUS                   $(INSTALLBASE)\*.apr
-	-copy $(subst /,\,$(APR))\LICENSE                  $(INSTALLBASE)\*
-	-copy $(subst /,\,$(APR))\CHANGES                  $(INSTALLBASE)\*.apr
-	@-xcopy $(XCOPYSW) docs                            $(INSTALLBASE)\docs\*.*
+	-$(CP) $(subst /,\,$(APR))\STATUS                   $(INSTALLBASE)\*.apr
+	-$(CP) $(subst /,\,$(APR))\LICENSE                  $(INSTALLBASE)\*
+	-$(CP) $(subst /,\,$(APR))\CHANGES                  $(INSTALLBASE)\*.apr
+	@-$(XCP) $(subst /,\,$(APR))\docs                   $(INSTALLBASE)\docs\*.*
 endif
 
 ifndef DEST
 installdev :: $(INSTDEVDIRS) FORCE
-	copy $(subst /,\,$(APR))\include\*.h               $(INSTALLBASE)\include\*.*
-	copy $(subst /,\,$(APR))\*.imp                     $(INSTALLBASE)\lib\*.*
-	copy $(subst /,\,$(APR))\misc\netware\*.xdc        $(INSTALLBASE)\lib\*.*
-	copy $(TARGET_lib)                                 $(INSTALLBASE)\lib\*.*
-	copy $(TARGET_nlm)                                 $(INSTALLBASE)\bin\*.*
+	$(CP) $(subst /,\,$(APR))\include\*.h               $(INSTALLBASE)\include\*.*
+	$(CP) $(subst /,\,$(APR))\*.imp                     $(INSTALLBASE)\lib\*.*
+	$(CP) $(subst /,\,$(APR))\misc\netware\*.xdc        $(INSTALLBASE)\lib\*.*
+	$(CP) $(subst /,\,$(APR)\$(TARGET_lib))             $(INSTALLBASE)\lib\*.*
+	$(CP) $(subst /,\,$(APR)\$(TARGET_nlm))             $(INSTALLBASE)\bin\*.*
 
 $(INSTDEVDIRS) ::
 	$(CHKNOT) $@\NUL mkdir $@

Modified: apr/apr/trunk/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUenvironment.inc?rev=789172&r1=789171&r2=789172&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUenvironment.inc (original)
+++ apr/apr/trunk/build/NWGNUenvironment.inc Sun Jun 28 23:15:11 2009
@@ -250,13 +250,13 @@
 DEL	= del /F
 DELTREE	= $(CMD) rd /s/q
 WINNT	= 1
-XCOPYSW = /E
 else
 CMD	= command /C
 DEL	= del
 DELTREE	= deltree /y
-XCOPYSW	= /E /Y
 endif
+CP	= copy /Y
+XCP	= xcopy /E /Y
 CHK	= $(CMD) if exist
 CHKNOT	= $(CMD) if not exist
 

Modified: apr/apr/trunk/build/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUmakefile?rev=789172&r1=789171&r2=789172&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUmakefile (original)
+++ apr/apr/trunk/build/NWGNUmakefile Sun Jun 28 23:15:11 2009
@@ -54,23 +54,23 @@
 
 $(APR)/include/%.h: $(APR)/include/%.hnw
 	@echo Creating $@
-	copy $(subst /,\,$<) $(subst /,\,$@)
+	$(CP) $(subst /,\,$<) $(subst /,\,$@)
 
 $(APR)/include/private/%.h: $(APR)/include/private/%.hnw
 	@echo Creating $@
-	copy $(subst /,\,$<) $(subst /,\,$@)
+	$(CP) $(subst /,\,$<) $(subst /,\,$@)
 
 $(APR)/include/private/%.h: $(APR)/include/private/%.hw
 	@echo Creating $@
-	copy $(subst /,\,$<) $(subst /,\,$@)
+	$(CP) $(subst /,\,$<) $(subst /,\,$@)
 
 $(APRXML)/%.h: $(APRXML)/%.hnw
 	@echo Creating $@
-	copy $(subst /,\,$<) $(subst /,\,$@)
+	$(CP) $(subst /,\,$<) $(subst /,\,$@)
 
 $(APRXML)/expat/lib/%.h: $(APRXML)/expat/lib/%.h.in
 	@echo Creating $@
-	copy $(subst /,\,$<) $(subst /,\,$@)
+	$(CP) $(subst /,\,$<) $(subst /,\,$@)
 
 #
 # You can use this target if all that is needed is to copy files to the

Modified: apr/apr/trunk/dbd/NWGNUdbdfreetds
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/NWGNUdbdfreetds?rev=789172&r1=789171&r2=789172&view=diff
==============================================================================
--- apr/apr/trunk/dbd/NWGNUdbdfreetds (original)
+++ apr/apr/trunk/dbd/NWGNUdbdfreetds Sun Jun 28 23:15:11 2009
@@ -176,7 +176,7 @@
 # If there is an NLM target, put it here
 #
 TARGET_nlm = \
-	$(OBJDIR)\$(NLM_NAME).nlm \
+	$(OBJDIR)/$(NLM_NAME).nlm \
 	$(EOLIST)
 
 #

Modified: apr/apr/trunk/dbd/NWGNUdbdmysql
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/NWGNUdbdmysql?rev=789172&r1=789171&r2=789172&view=diff
==============================================================================
--- apr/apr/trunk/dbd/NWGNUdbdmysql (original)
+++ apr/apr/trunk/dbd/NWGNUdbdmysql Sun Jun 28 23:15:11 2009
@@ -177,7 +177,7 @@
 # If there is an NLM target, put it here
 #
 TARGET_nlm = \
-	$(OBJDIR)\$(NLM_NAME).nlm \
+	$(OBJDIR)/$(NLM_NAME).nlm \
 	$(EOLIST)
 
 #

Modified: apr/apr/trunk/dbd/NWGNUdbdpgsql
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/NWGNUdbdpgsql?rev=789172&r1=789171&r2=789172&view=diff
==============================================================================
--- apr/apr/trunk/dbd/NWGNUdbdpgsql (original)
+++ apr/apr/trunk/dbd/NWGNUdbdpgsql Sun Jun 28 23:15:11 2009
@@ -177,7 +177,7 @@
 # If there is an NLM target, put it here
 #
 TARGET_nlm = \
-	$(OBJDIR)\$(NLM_NAME).nlm \
+	$(OBJDIR)/$(NLM_NAME).nlm \
 	$(EOLIST)
 
 #

Modified: apr/apr/trunk/dbd/NWGNUdbdsqli2
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/NWGNUdbdsqli2?rev=789172&r1=789171&r2=789172&view=diff
==============================================================================
--- apr/apr/trunk/dbd/NWGNUdbdsqli2 (original)
+++ apr/apr/trunk/dbd/NWGNUdbdsqli2 Sun Jun 28 23:15:11 2009
@@ -176,7 +176,7 @@
 # If there is an NLM target, put it here
 #
 TARGET_nlm = \
-	$(OBJDIR)\$(NLM_NAME).nlm \
+	$(OBJDIR)/$(NLM_NAME).nlm \
 	$(EOLIST)
 
 #

Modified: apr/apr/trunk/dbd/NWGNUdbdsqli3
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/NWGNUdbdsqli3?rev=789172&r1=789171&r2=789172&view=diff
==============================================================================
--- apr/apr/trunk/dbd/NWGNUdbdsqli3 (original)
+++ apr/apr/trunk/dbd/NWGNUdbdsqli3 Sun Jun 28 23:15:11 2009
@@ -135,7 +135,7 @@
 
 #
 # If this is specified, it will override VERSION value in
-# $(AP_WORK)\build\NWGNUenvironment.inc
+# $(APR_WORK)/build/NWGNUenvironment.inc
 #
 NLM_VERSION	=
 
@@ -176,7 +176,7 @@
 # If there is an NLM target, put it here
 #
 TARGET_nlm = \
-	$(OBJDIR)\$(NLM_NAME).nlm \
+	$(OBJDIR)/$(NLM_NAME).nlm \
 	$(EOLIST)
 
 #
@@ -277,7 +277,7 @@
 
 #
 # Updated this target to create necessary directories and copy files to the
-# correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
+# correct place.  (See $(APR_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
 

Modified: apr/apr/trunk/dbd/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/NWGNUmakefile?rev=789172&r1=789171&r2=789172&view=diff
==============================================================================
--- apr/apr/trunk/dbd/NWGNUmakefile (original)
+++ apr/apr/trunk/dbd/NWGNUmakefile Sun Jun 28 23:15:11 2009
@@ -111,7 +111,7 @@
 
 #
 # If this is specified, it will override VERSION value in
-# $(AP_WORK)\build\NWGNUenvironment.inc
+# $(APR_WORK)/build/NWGNUenvironment.inc
 #
 NLM_VERSION	=
 
@@ -241,10 +241,10 @@
 
 #
 # Updated this target to create necessary directories and copy files to the
-# correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
+# correct place.  (See $(APR_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms $(INSTDIRS) FORCE
-	copy $(OBJDIR)\*.nlm $(INSTALLBASE)
+	$(CP) $(OBJDIR)\*.nlm $(INSTALLBASE)
 
 #
 # Any specialized rules here

Modified: apr/apr/trunk/dbm/NWGNUdbmdb
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbm/NWGNUdbmdb?rev=789172&r1=789171&r2=789172&view=diff
==============================================================================
--- apr/apr/trunk/dbm/NWGNUdbmdb (original)
+++ apr/apr/trunk/dbm/NWGNUdbmdb Sun Jun 28 23:15:11 2009
@@ -11,7 +11,7 @@
 #
 
 ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
 endif
 
 #include $(APR)\build\NWGNUcustom.inc
@@ -138,7 +138,7 @@
 
 #
 # If this is specified, it will override VERSION value in
-# $(AP_WORK)\build\NWGNUenvironment.inc
+# $(APR_WORK)/build/NWGNUenvironment.inc
 #
 NLM_VERSION	=
 
@@ -278,7 +278,7 @@
 
 #
 # Updated this target to create necessary directories and copy files to the
-# correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
+# correct place.  (See $(APR_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
 
@@ -291,7 +291,7 @@
 # in this makefile
 #
 
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APR_WORK)/build/NWGNUtail.inc
 
 
 

Modified: apr/apr/trunk/dbm/NWGNUdbmgdbm
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbm/NWGNUdbmgdbm?rev=789172&r1=789171&r2=789172&view=diff
==============================================================================
--- apr/apr/trunk/dbm/NWGNUdbmgdbm (original)
+++ apr/apr/trunk/dbm/NWGNUdbmgdbm Sun Jun 28 23:15:11 2009
@@ -11,7 +11,7 @@
 #
 
 ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
 endif
 
 #include $(APR)\build\NWGNUcustom.inc
@@ -137,7 +137,7 @@
 
 #
 # If this is specified, it will override VERSION value in
-# $(AP_WORK)\build\NWGNUenvironment.inc
+# $(APR_WORK)/build/NWGNUenvironment.inc
 #
 NLM_VERSION	=
 
@@ -277,7 +277,7 @@
 
 #
 # Updated this target to create necessary directories and copy files to the
-# correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
+# correct place.  (See $(APR_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
 
@@ -290,7 +290,7 @@
 # in this makefile
 #
 
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APR_WORK)/build/NWGNUtail.inc
 
 
 

Modified: apr/apr/trunk/dbm/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbm/NWGNUmakefile?rev=789172&r1=789171&r2=789172&view=diff
==============================================================================
--- apr/apr/trunk/dbm/NWGNUmakefile (original)
+++ apr/apr/trunk/dbm/NWGNUmakefile Sun Jun 28 23:15:11 2009
@@ -10,7 +10,7 @@
 # paths to tools
 #
 
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
 
 #
 # build this level's files
@@ -111,7 +111,7 @@
 
 #
 # If this is specified, it will override VERSION value in
-# $(AP_WORK)\build\NWGNUenvironment.inc
+# $(APR_WORK)/build/NWGNUenvironment.inc
 #
 NLM_VERSION	=
 
@@ -232,7 +232,7 @@
 
 #
 # Updated this target to create necessary directories and copy files to the
-# correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
+# correct place.  (See $(APR_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms $(INSTDIRS) FORCE
 	copy $(OBJDIR)\*.nlm $(INSTALLBASE)
@@ -246,6 +246,6 @@
 # in this makefile
 #
 
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APR_WORK)/build/NWGNUtail.inc
 
 

Modified: apr/apr/trunk/ldap/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/trunk/ldap/NWGNUmakefile?rev=789172&r1=789171&r2=789172&view=diff
==============================================================================
--- apr/apr/trunk/ldap/NWGNUmakefile (original)
+++ apr/apr/trunk/ldap/NWGNUmakefile Sun Jun 28 23:15:11 2009
@@ -222,7 +222,7 @@
 #
 FILES_nlm_exports = \
 	$(EOLIST)
-	
+
 #   
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character

Modified: apr/apr/trunk/test/NWGNUaprtest
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUaprtest?rev=789172&r1=789171&r2=789172&view=diff
==============================================================================
--- apr/apr/trunk/test/NWGNUaprtest (original)
+++ apr/apr/trunk/test/NWGNUaprtest Sun Jun 28 23:15:11 2009
@@ -8,7 +8,7 @@
 #
 
 ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
 endif
 
 #
@@ -110,7 +110,7 @@
 
 #
 # If this is specified, it will override VERSION value in 
-# $(APR_WORK)\build\NWGNUenvironment.inc
+# $(APR_WORK)/build/NWGNUenvironment.inc
 #
 NLM_VERSION		= 1,0,0
 
@@ -255,7 +255,7 @@
 #
 FILES_nlm_Ximports = \
 	@libc.imp \
-	@$(APR)/aprlib.imp	\
+	@$(APR)/aprlib.imp \
 	$(EOLIST)
  
 #   
@@ -263,7 +263,7 @@
 #
 FILES_nlm_exports = \
 	$(EOLIST)
-	
+
 #   
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
@@ -281,7 +281,7 @@
 
 #
 # Updated this target to create necessary directories and copy files to the 
-# correct place.  (See $(APR_WORK)\build\NWGNUhead.inc for examples)
+# correct place.  (See $(APR_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
 
@@ -295,6 +295,6 @@
 # in this makefile
 #
 
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APR_WORK)/build/NWGNUtail.inc
 
 

Modified: apr/apr/trunk/test/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUmakefile?rev=789172&r1=789171&r2=789172&view=diff
==============================================================================
--- apr/apr/trunk/test/NWGNUmakefile (original)
+++ apr/apr/trunk/test/NWGNUmakefile Sun Jun 28 23:15:11 2009
@@ -249,7 +249,7 @@
 # correct place.  (See $(APR_WORK)\build\NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-	copy $(OBJDIR)\*.nlm $(INSTALLBASE)
+	$(CP) $(OBJDIR)\*.nlm $(INSTALLBASE)
 
 #
 # Any specialized rules here

Modified: apr/apr/trunk/test/NWGNUproc_child
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUproc_child?rev=789172&r1=789171&r2=789172&view=diff
==============================================================================
--- apr/apr/trunk/test/NWGNUproc_child (original)
+++ apr/apr/trunk/test/NWGNUproc_child Sun Jun 28 23:15:11 2009
@@ -220,7 +220,7 @@
 #
 FILES_nlm_exports = \
 	$(EOLIST)
-	
+
 #   
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character

Modified: apr/apr/trunk/test/NWGNUreadchild
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUreadchild?rev=789172&r1=789171&r2=789172&view=diff
==============================================================================
--- apr/apr/trunk/test/NWGNUreadchild (original)
+++ apr/apr/trunk/test/NWGNUreadchild Sun Jun 28 23:15:11 2009
@@ -8,7 +8,7 @@
 #
 
 ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
 endif
 
 #
@@ -54,7 +54,6 @@
 
 XLFLAGS		+= \
 			$(EOLIST)
-						
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -69,8 +68,6 @@
 
 XLFLAGS		+= \
 			$(EOLIST)
-
-			$(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -92,13 +89,13 @@
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME		=	readchild
+NLM_NAME	= readchild
 
 #
 # This is used by the link '-desc ' directive. 
 # If left blank, NLM_NAME will be used.
 #
-NLM_DESCRIPTION	=  child NLM to test the pipe layer
+NLM_DESCRIPTION	= child NLM to test the pipe layer
 
 #
 # This is used by the '-threadname' directive.  If left blank,
@@ -114,9 +111,9 @@
 
 #
 # If this is specified, it will override VERSION value in 
-# $(APR_WORK)\build\NWGNUenvironment.inc
+# $(APR_WORK)/build/NWGNUenvironment.inc
 #
-NLM_VERSION		= 1,0,0
+NLM_VERSION	=
 
 #
 # If this is specified, it will override the default of 64K
@@ -141,14 +138,14 @@
 #
 # If this is specified it will be used by the link '-flags' directive
 #
-NLM_FLAGS		= AUTOUNLOAD, PSEUDOPREEMPTION, MULTIPLE
+NLM_FLAGS	= AUTOUNLOAD, PSEUDOPREEMPTION, MULTIPLE
  
 #
 # If this is specified it will be linked in with the XDCData option in the def 
 # file instead of the default of $(APR)/misc/netware/apache.xdc.  XDCData can 
 # be disabled by setting APACHE_UNIPROC in the environment
 #
-XDCDATA         = 
+XDCDATA		= 
 
 #
 # Declare all target files (you must add your files here)
@@ -220,7 +217,7 @@
 #
 FILES_nlm_exports = \
 	$(EOLIST)
-	
+
 #   
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
@@ -238,7 +235,7 @@
 
 #
 # Updated this target to create necessary directories and copy files to the 
-# correct place.  (See $(APR_WORK)\build\NWGNUhead.inc for examples)
+# correct place.  (See $(APR_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
 
@@ -251,5 +248,5 @@
 # in this makefile
 #
 
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APR_WORK)/build/NWGNUtail.inc
 

Modified: apr/apr/trunk/test/NWGNUsockchild
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUsockchild?rev=789172&r1=789171&r2=789172&view=diff
==============================================================================
--- apr/apr/trunk/test/NWGNUsockchild (original)
+++ apr/apr/trunk/test/NWGNUsockchild Sun Jun 28 23:15:11 2009
@@ -8,7 +8,7 @@
 #
 
 ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
 endif
 
 #
@@ -54,7 +54,6 @@
 
 XLFLAGS		+= \
 			$(EOLIST)
-						
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -69,8 +68,6 @@
 
 XLFLAGS		+= \
 			$(EOLIST)
-
-			$(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -92,13 +89,13 @@
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME		=	sockchild
+NLM_NAME	= sockchild
 
 #
 # This is used by the link '-desc ' directive. 
 # If left blank, NLM_NAME will be used.
 #
-NLM_DESCRIPTION	=  socket NLM to test sockets
+NLM_DESCRIPTION	= socket NLM to test sockets
 
 #
 # This is used by the '-threadname' directive.  If left blank,
@@ -114,9 +111,9 @@
 
 #
 # If this is specified, it will override VERSION value in 
-# $(APR_WORK)\build\NWGNUenvironment.inc
+# $(APR_WORK)/build/NWGNUenvironment.inc
 #
-NLM_VERSION		= 1,0,0
+NLM_VERSION	=
 
 #
 # If this is specified, it will override the default of 64K
@@ -141,14 +138,14 @@
 #
 # If this is specified it will be used by the link '-flags' directive
 #
-NLM_FLAGS		= AUTOUNLOAD, PSEUDOPREEMPTION, MULTIPLE
+NLM_FLAGS	= AUTOUNLOAD, PSEUDOPREEMPTION, MULTIPLE
  
 #
 # If this is specified it will be linked in with the XDCData option in the def 
 # file instead of the default of $(APR)/misc/netware/apache.xdc.  XDCData can 
 # be disabled by setting APACHE_UNIPROC in the environment
 #
-XDCDATA         = 
+XDCDATA		= 
 
 #
 # Declare all target files (you must add your files here)
@@ -220,7 +217,7 @@
 #
 FILES_nlm_exports = \
 	$(EOLIST)
-	
+
 #   
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
@@ -238,7 +235,7 @@
 
 #
 # Updated this target to create necessary directories and copy files to the 
-# correct place.  (See $(APR_WORK)\build\NWGNUhead.inc for examples)
+# correct place.  (See $(APR_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
 
@@ -251,5 +248,5 @@
 # in this makefile
 #
 
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APR_WORK)/build/NWGNUtail.inc
 

Modified: apr/apr/trunk/test/NWGNUtestatmc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUtestatmc?rev=789172&r1=789171&r2=789172&view=diff
==============================================================================
--- apr/apr/trunk/test/NWGNUtestatmc (original)
+++ apr/apr/trunk/test/NWGNUtestatmc Sun Jun 28 23:15:11 2009
@@ -8,7 +8,7 @@
 #
 
 ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
 endif
 
 #
@@ -89,12 +89,12 @@
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME		=testatmc
+NLM_NAME	= testatmc
 #
 # This is used by the link '-desc ' directive. 
 # If left blank, NLM_NAME will be used.
 #
-NLM_DESCRIPTION	=  NLM is to test the atomic functions
+NLM_DESCRIPTION	= NLM is to test the atomic functions
 
 #
 # This is used by the '-threadname' directive.  If left blank,
@@ -110,9 +110,9 @@
 
 #
 # If this is specified, it will override VERSION value in 
-# $(APR_WORK)\build\NWGNUenvironment.inc
+# $(APR_WORK)/build/NWGNUenvironment.inc
 #
-NLM_VERSION		= 1,0,0
+NLM_VERSION	=
 
 #
 # If this is specified, it will override the default of 64K
@@ -137,14 +137,14 @@
 #
 # If this is specified it will be used by the link '-flags' directive
 #
-NLM_FLAGS		= AUTOUNLOAD, PSEUDOPREEMPTION
+NLM_FLAGS	= AUTOUNLOAD, PSEUDOPREEMPTION
  
 #
 # If this is specified it will be linked in with the XDCData option in the def 
 # file instead of the default of $(APR)/misc/netware/apache.xdc.  XDCData can 
 # be disabled by setting APACHE_UNIPROC in the environment
 #
-XDCDATA         = 
+XDCDATA		= 
 
 #
 # Declare all target files (you must add your files here)
@@ -173,7 +173,7 @@
 	$(EOLIST)
 
 # Pending tests
-	
+
 #
 # These are the LIB files needed to create the NLM target above.
 # These will be added as a library command in the link.opt file.
@@ -219,7 +219,7 @@
 #
 FILES_nlm_exports = \
 	$(EOLIST)
-	
+
 #   
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
@@ -237,7 +237,7 @@
 
 #
 # Updated this target to create necessary directories and copy files to the 
-# correct place.  (See $(APR_WORK)\build\NWGNUhead.inc for examples)
+# correct place.  (See $(APR_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
 
@@ -251,5 +251,5 @@
 # in this makefile
 #
 
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APR_WORK)/build/NWGNUtail.inc
 

Modified: apr/apr/trunk/test/NWGNUtryread
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/NWGNUtryread?rev=789172&r1=789171&r2=789172&view=diff
==============================================================================
--- apr/apr/trunk/test/NWGNUtryread (original)
+++ apr/apr/trunk/test/NWGNUtryread Sun Jun 28 23:15:11 2009
@@ -8,7 +8,7 @@
 #
 
 ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
 endif
 
 #
@@ -54,7 +54,6 @@
 
 XLFLAGS		+= \
 			$(EOLIST)
-						
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -69,8 +68,6 @@
 
 XLFLAGS		+= \
 			$(EOLIST)
-
-			$(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -92,13 +89,13 @@
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME		=	tryread
+NLM_NAME	= tryread
 
 #
 # This is used by the link '-desc ' directive. 
 # If left blank, NLM_NAME will be used.
 #
-NLM_DESCRIPTION	=  reader NLM to test flock
+NLM_DESCRIPTION	= reader NLM to test flock
 
 #
 # This is used by the '-threadname' directive.  If left blank,
@@ -114,9 +111,9 @@
 
 #
 # If this is specified, it will override VERSION value in 
-# $(APR_WORK)\build\NWGNUenvironment.inc
+# $(APR_WORK)/build/NWGNUenvironment.inc
 #
-NLM_VERSION		= 1,0,0
+NLM_VERSION	=
 
 #
 # If this is specified, it will override the default of 64K
@@ -141,14 +138,14 @@
 #
 # If this is specified it will be used by the link '-flags' directive
 #
-NLM_FLAGS		= AUTOUNLOAD, PSEUDOPREEMPTION, MULTIPLE
+NLM_FLAGS	= AUTOUNLOAD, PSEUDOPREEMPTION, MULTIPLE
  
 #
 # If this is specified it will be linked in with the XDCData option in the def 
 # file instead of the default of $(APR)/misc/netware/apache.xdc.  XDCData can 
 # be disabled by setting APACHE_UNIPROC in the environment
 #
-XDCDATA         = 
+XDCDATA		= 
 
 #
 # Declare all target files (you must add your files here)
@@ -220,7 +217,7 @@
 #
 FILES_nlm_exports = \
 	$(EOLIST)
-	
+
 #   
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
@@ -238,7 +235,7 @@
 
 #
 # Updated this target to create necessary directories and copy files to the 
-# correct place.  (See $(APR_WORK)\build\NWGNUhead.inc for examples)
+# correct place.  (See $(APR_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
 
@@ -251,5 +248,5 @@
 # in this makefile
 #
 
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APR_WORK)/build/NWGNUtail.inc
 



Mime
View raw message