apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r789137 - in /apr/apr/trunk: ./ buckets/ build/ dbd/ ldap/ xml/
Date Sun, 28 Jun 2009 18:30:35 GMT
Author: fuankg
Date: Sun Jun 28 18:30:34 2009
New Revision: 789137

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

Modified:
    apr/apr/trunk/NWGNUmakefile
    apr/apr/trunk/buckets/NWGNUmakefile
    apr/apr/trunk/build/NWGNUenvironment.inc
    apr/apr/trunk/build/NWGNUhead.inc
    apr/apr/trunk/build/NWGNUmakefile
    apr/apr/trunk/build/NWGNUtail.inc
    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/ldap/NWGNUmakefile
    apr/apr/trunk/xml/NWGNUmakefile

Modified: apr/apr/trunk/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/trunk/NWGNUmakefile?rev=789137&r1=789136&r2=789137&view=diff
==============================================================================
--- apr/apr/trunk/NWGNUmakefile (original)
+++ apr/apr/trunk/NWGNUmakefile Sun Jun 28 18:30:34 2009
@@ -20,7 +20,7 @@
 # paths to tools
 #
 
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
 
 #
 # build this level's files
@@ -35,9 +35,9 @@
 #
 XINCDIRS	+= \
 			$(APR)/include \
+			$(APR)/include/private \
 			$(APR)/include/arch/NetWare \
 			$(APR)/include/arch/unix \
-			$(APR)/include/private \
 			$(APR)/dbm/sdbm \
 			$(APR)/uri \
 			$(APR)/memory/unix \
@@ -129,7 +129,7 @@
 NLM_THREAD_NAME	=
 #
 # If this is specified, it will override VERSION value in
-# $(APR_WORK)\build\NWGNUenvironment.inc
+# $(APR_WORK)/build/NWGNUenvironment.inc
 #
 NLM_VERSION	=
 
@@ -381,7 +381,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 $(INSTDIRS) FORCE
 	copy $(TARGET_nlm)                                 $(INSTALLBASE)\*.*
@@ -415,21 +415,20 @@
 vpath %.c crypto:dbd:dbm:dbm/sdbm:encoding:hooks:ldap:memcache:misc:strmatch:uri:xlate
 
 # Use the win32 network_io if Winsock is being used
-ifdef USE_STDSOCKETS
-vpath %.c network_io/unix
-else
-vpath %.c network_io/win32:network_io/unix
+ifndef USE_STDSOCKETS
+vpath %.c network_io/win32
 endif
+vpath %.c network_io/unix
 
-$(OBJDIR)/%.o: file_io/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt
+$(OBJDIR)/%.o: file_io/netware/%.c $(OBJDIR)/$(NLM_NAME)_cc.opt
 	@echo Compiling $<
-	$(CC) file_io\netware\$(<F) -cwd source -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
+	$(CC) -cwd source -o $@ $< @$(OBJDIR)/$(NLM_NAME)_cc.opt
 
 #
 # Include the 'tail' makefile that has targets that depend on variables defined
 # in this makefile
 #
 
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APR_WORK)/build/NWGNUtail.inc
 
 

Modified: apr/apr/trunk/buckets/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/trunk/buckets/NWGNUmakefile?rev=789137&r1=789136&r2=789137&view=diff
==============================================================================
--- apr/apr/trunk/buckets/NWGNUmakefile (original)
+++ apr/apr/trunk/buckets/NWGNUmakefile Sun Jun 28 18:30:34 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
@@ -25,8 +25,8 @@
 #
 XINCDIRS	+= \
 			$(APR)/include \
-			$(APR)/include/arch/NetWare \
 			$(APR)/include/private \
+			$(APR)/include/arch/NetWare \
 			$(EOLIST)
 
 #
@@ -113,7 +113,7 @@
 NLM_THREAD_NAME	= 
 #
 # If this is specified, it will override VERSION value in 
-# $(APR_WORK)\build\NWGNUenvironment.inc
+# $(APR_WORK)/build/NWGNUenvironment.inc
 #
 NLM_VERSION	=
 
@@ -244,7 +244,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
 
@@ -257,5 +257,5 @@
 # in this makefile
 #
 
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APR_WORK)/build/NWGNUtail.inc
 

Modified: apr/apr/trunk/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUenvironment.inc?rev=789137&r1=789136&r2=789137&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUenvironment.inc (original)
+++ apr/apr/trunk/build/NWGNUenvironment.inc Sun Jun 28 18:30:34 2009
@@ -2,9 +2,9 @@
 # Setup needed Tools and Libraries
 #
 
-ifeq "$(wildcard $(APR_WORK)\build\NWGNUcustom.inc)" "$(APR_WORK)\build\NWGNUcustom.inc"
-include $(APR_WORK)\build\NWGNUcustom.inc
-CUSTOM_INI = $(AP_WORK)\NWGNUcustom.ini
+ifeq "$(wildcard $(APR_WORK)/build/NWGNUcustom.inc)" "$(APR_WORK)/build/NWGNUcustom.inc"
+include $(APR_WORK)/build/NWGNUcustom.inc
+CUSTOM_INI = $(AP_WORK)/NWGNUcustom.ini
 endif
 
 ifndef VERBOSE
@@ -111,20 +111,23 @@
 LINK	= mwldnlm
 LIB	= mwldnlm -type library -w nocmdline
 
+# Setup build tools
+AWK	= awk
+
 ifdef IPV6
 ifndef USE_STDSOCKETS
 USE_STDSOCKETS=1
 endif
 endif
 
-NOVI	= $(NOVELLLIBC)\imports
+NOVI	= $(NOVELLLIBC)/imports
 
-INCDIRS	= $(NOVELLLIBC)\include;$(NOVELLLIBC)\include\nks;
+INCDIRS	= $(NOVELLLIBC)/include;$(NOVELLLIBC)/include/nks;
 
 DEFINES	= -DNETWARE
 ifndef USE_STDSOCKETS
 DEFINES	+= -DUSE_WINSOCK
-INCDIRS	+= $(NOVELLLIBC)\include\winsock;
+INCDIRS	+= $(NOVELLLIBC)/include/winsock;
 endif
 ifndef DEBUG
 DEFINES	+= -DNDEBUG
@@ -139,9 +142,9 @@
 #
 # MetroWerks static Libraries
 
-CLIB3S	= $(METROWERKS)\Novell Support\Metrowerks Support\Libraries\Runtime\mwcrtl.lib
+CLIB3S	= $(METROWERKS)/Novell Support/Metrowerks Support/Libraries/Runtime/mwcrtl.lib
 MATH3S	=
-PLIB3S	= $(METROWERKS)\Novell Support\Metrowerks Support\Libraries\MSL C++\MWCPP.lib
+PLIB3S	= $(METROWERKS)/Novell Support/Metrowerks Support/Libraries/MSL C++/MWCPP.lib
 
 # Base compile flags
 # and prefix or precompiled header added here.
@@ -276,11 +279,11 @@
 # Common directories
 #
 
-APR		= $(APR_WORK)
-APRTEST		= $(APR_WORK)/test
-APRBUCKETS	= $(APR_WORK)/buckets
-APRLDAP		= $(APR_WORK)/ldap
-APRXML		= $(APR_WORK)/xml
+APR		= $(subst \,/,$(APR_WORK))
+APRTEST		= $(APR)/test
+APRBUCKETS	= $(APR)/buckets
+APRLDAP		= $(APR)/ldap
+APRXML		= $(APR)/xml
 
 #
 # Internal Libraries

Modified: apr/apr/trunk/build/NWGNUhead.inc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUhead.inc?rev=789137&r1=789136&r2=789137&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUhead.inc (original)
+++ apr/apr/trunk/build/NWGNUhead.inc Sun Jun 28 18:30:34 2009
@@ -2,7 +2,7 @@
 # Obtain the global build environment
 #
 
-include $(APR_WORK)\build\NWGNUenvironment.inc
+include $(APR_WORK)/build/NWGNUenvironment.inc
 
 #
 # Define base targets and rules

Modified: apr/apr/trunk/build/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUmakefile?rev=789137&r1=789136&r2=789137&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUmakefile (original)
+++ apr/apr/trunk/build/NWGNUmakefile Sun Jun 28 18:30:34 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
@@ -22,50 +22,50 @@
 	$(APR)/include/apr_ldap.h \
 	$(APR)/include/private/apu_config.h \
 	$(APR)/include/private/apu_select_dbm.h \
-	$(APR)/xml/expat_config.h \
+	$(APRXML)/expat_config.h \
 	$(EOLIST)
-#	$(APR)/xml/expat/lib/expat.h \
+#	$(APRXML)/expat/lib/expat.h \
     
 nlms :: $(APR)/aprlib.imp
 
 $(APR)/aprlib.imp : make_nw_export.awk nw_export.i
-	@echo Generating $(subst /,\,$@)
-	awk -f make_nw_export.awk nw_export.i | sort >$(APR)/aprlib.imp
+	@echo Generating $@
+	$(AWK) -f $^ | sort >$@
     
 nw_export.i : nw_export.inc $(FILES_prebuild_headers) $(NLM_NAME)_cc.opt
-	@echo Generating $(subst /,\,$@)
+	@echo Generating $@
 	$(CC) $< @$(NLM_NAME)_cc.opt
 
-$(NLM_NAME)_cc.opt : NWGNUmakefile $(APR_WORK)\build\NWGNUenvironment.inc $(APR_WORK)\build\NWGNUhead.inc
$(APR_WORK)\build\NWGNUtail.inc $(CUSTOM_INI)
+$(NLM_NAME)_cc.opt : NWGNUmakefile $(APR)/build/NWGNUenvironment.inc $(APR)/build/NWGNUhead.inc
$(APR)/build/NWGNUtail.inc $(CUSTOM_INI)
 	$(CHK) $@ $(DEL) $@
 	@echo -P >> $@
 	@echo -EP >> $@
 	@echo -nosyspath >> $@
 	@echo -w nocmdline >> $@
 	@echo $(DEFINES) -DGENEXPORTS >> $@
-	@echo -I$(APR)\include >> $@
-	@echo -I$(APR)\include\arch\netware >> $@
-	@echo -I$(APR)\include\arch\unix >> $@
-	@echo -I$(APR)\build >> $@
+	@echo -I$(APR)/include >> $@
+	@echo -I$(APR)/include/arch/netware >> $@
+	@echo -I$(APR)/include/arch/unix >> $@
+	@echo -I$(APR)/build >> $@
 	@echo -ir $(NOVELLLIBC) >> $@
 ifneq "$(LDAPSDK)" ""
 	@echo -ir $(LDAPSDK) >> $@
 endif
 
 $(APR)/include/%.h: $(APR)/include/%.hnw
-	@echo Creating $(subst /,\,$@)
+	@echo Creating $@
 	copy $(subst /,\,$<) $(subst /,\,$@)
 
 $(APR)/include/private/%.h: $(APR)/include/private/%.hnw
-	@echo Creating $(subst /,\,$@)
+	@echo Creating $@
 	copy $(subst /,\,$<) $(subst /,\,$@)
 
 $(APR)/include/private/%.h: $(APR)/include/private/%.hw
-	@echo Creating $(subst /,\,$@)
+	@echo Creating $@
 	copy $(subst /,\,$<) $(subst /,\,$@)
 
 $(APRXML)/%.h: $(APRXML)/%.hnw
-	@echo Creating $(subst /,\,$@)
+	@echo Creating $@
 	copy $(subst /,\,$<) $(subst /,\,$@)
 
 $(APRXML)/expat/lib/%.h: $(APRXML)/expat/lib/%.h.in
@@ -77,7 +77,7 @@
 # installation area
 #
 install :: nlms FORCE
-	
+
 
 clean ::
 	$(CHK) nw_export.i                                          $(DEL) nw_export.i
@@ -89,7 +89,7 @@
 	$(CHK) $(subst /,\,$(APR))\include\apr_ldap.h               $(DEL) $(subst /,\,$(APR))\include\apr_ldap.h
 	$(CHK) $(subst /,\,$(APR))\include\private\apu_config.h     $(DEL) $(subst /,\,$(APR))\include\private\apu_config.h
 	$(CHK) $(subst /,\,$(APR))\include\private\apu_select_dbm.h $(DEL) $(subst /,\,$(APR))\include\private\apu_select_dbm.h
-	$(CHK) $(subst /,\,$(APR))\xml\expat_config.h               $(DEL) $(subst /,\,$(APR))\xml\expat_config.h
-#	$(CHK) $(subst /,\,$(APR))\xml\expat.h                      $(DEL) $(subst /,\,$(APR))\xml\expat.h
 	$(CHK) $(subst /,\,$(APR))\aprlib.imp                       $(DEL) $(subst /,\,$(APR))\aprlib.imp
+	$(CHK) $(subst /,\,$(APRXML))\expat_config.h                $(DEL) $(subst /,\,$(APRXML))\expat_config.h
+#	$(CHK) $(subst /,\,$(APRXML))\expat.h                       $(DEL) $(subst /,\,$(APRXML))\expat.h
     

Modified: apr/apr/trunk/build/NWGNUtail.inc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUtail.inc?rev=789137&r1=789136&r2=789137&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUtail.inc (original)
+++ apr/apr/trunk/build/NWGNUtail.inc Sun Jun 28 18:30:34 2009
@@ -33,38 +33,38 @@
 #
 
 
-CCOPT_DEPENDS 	= \
-				$(APR_WORK)\build\NWGNUhead.inc \
-				$(APR_WORK)\build\NWGNUenvironment.inc \
-				$(APR_WORK)\build\NWGNUtail.inc \
+CCOPT_DEPENDS			= \
+				$(APR)/build/NWGNUhead.inc \
+				$(APR)/build/NWGNUenvironment.inc \
+				$(APR)/build/NWGNUtail.inc \
 				NWGNUmakefile \
 				$(CUSTOM_INI) \
 				$(EOLIST)
 
-CPPOPT_DEPENDS	= \
-				$(APR_WORK)\build\NWGNUhead.inc \
-				$(APR_WORK)\build\NWGNUenvironment.inc \
-				$(APR_WORK)\build\NWGNUtail.inc \
+CPPOPT_DEPENDS			= \
+				$(APR)/build/NWGNUhead.inc \
+				$(APR)/build/NWGNUenvironment.inc \
+				$(APR)/build/NWGNUtail.inc \
 				NWGNUmakefile \
 				$(CUSTOM_INI) \
 				$(EOLIST)
 
 $(NLM_NAME)_LINKOPT_DEPENDS	= \
 				$(TARGET_lib) \
-				$(APR_WORK)\build\NWGNUenvironment.inc \
+				$(APR)/build/NWGNUenvironment.inc \
 				NWGNUmakefile \
-				$(APR_WORK)\build\NWGNUtail.inc \
+				$(APR)/build/NWGNUtail.inc \
 				$(CUSTOM_INI) \
 				$(VERSION_INC) \
 				$(EOLIST)
 
 ifeq "$(words $(strip $(TARGET_lib)))" "1"
-LIB_NAME					= $(basename $(notdir $(TARGET_lib)))
+LIB_NAME			= $(basename $(notdir $(TARGET_lib)))
 $(LIB_NAME)_LIBLST_DEPENDS	= \
 				$(FILES_lib_objs) \
-				$(APR_WORK)\build\NWGNUenvironment.inc \
+				$(APR)/build/NWGNUenvironment.inc \
 				NWGNUmakefile \
-				$(APR_WORK)\build\NWGNUtail.inc \
+				$(APR)/build/NWGNUtail.inc \
 				$(CUSTOM_INI) \
 				$(EOLIST)
 endif
@@ -83,14 +83,14 @@
 # Generic compiler rules
 #
 
-$(APR_WORK)\build\NWGNUversion.inc : $(APR_WORK)\include\apr_version.h $(APR_WORK)\build\nw_ver.awk
-	@echo Generating $(subst /,\,$@)
-	awk -f $(APR_WORK)\build\nw_ver.awk $(APR_WORK)\include\apr_version.h > $(APR_WORK)\build\NWGNUversion.inc
+$(APR)/build/NWGNUversion.inc : $(APR)/build/nw_ver.awk $(APR)/include/apr_version.h
+	@echo Generating $@
+	$(AWK) -f $^ > $@
 
--include $(APR_WORK)\build\NWGNUversion.inc
+-include $(APR)/build/NWGNUversion.inc
 
 ifneq "$(strip $(VERSION_STR))" ""
-VERSION_INC = $(APR_WORK)\build\NWGNUversion.inc
+VERSION_INC = $(APR)/build/NWGNUversion.inc
 else
 VERSION		= 1,0,0
 VERSION_STR	= 1.0.0
@@ -106,13 +106,13 @@
 
 ifeq "$(INCLUDE_BLDCMDS)" "1"
 
-$(OBJDIR)/%.o: %.c $(OBJDIR)\$(NLM_NAME)_cc.opt
+$(OBJDIR)/%.o: %.c $(OBJDIR)/$(NLM_NAME)_cc.opt
 	@echo Compiling $<
-	$(CC) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\$(NLM_NAME)_cc.opt
+	$(CC) $< -o $@ @$(OBJDIR)/$(NLM_NAME)_cc.opt
 
-$(OBJDIR)\$(NLM_NAME)_cc.opt: $(CCOPT_DEPENDS)
-	@echo CCOPT_DEPENDS=$(CCOPT_DEPENDS)
-	$(CHK) $@ $(DEL) $@
+$(OBJDIR)/$(NLM_NAME)_cc.opt: $(CCOPT_DEPENDS)
+	$(CHK) $(subst /,\,$@) $(DEL) $(subst /,\,$@)
+	@echo CCOPT_DEPENDS=$<
 	@echo Generating $@
 ifneq "$(strip $(CFLAGS))" ""
 	@echo $(CFLAGS) >> $@
@@ -133,12 +133,13 @@
 	@echo $(XDEFINES) >> $@
 endif
 
-$(OBJDIR)/%.o: %.cpp $(OBJDIR)\cpp.opt
+$(OBJDIR)/%.o: %.cpp $(OBJDIR)/cpp.opt
 	@echo Compiling $<
-	$(CPP) $< -o=$(OBJDIR)\$(@F) @$(OBJDIR)\cpp.opt
+	$(CPP) $< -o $@ @$(OBJDIR)/cpp.opt
 
-$(OBJDIR)\cpp.opt: $(CPPOPT_DEPENDS)
-	$(CHK) $@ $(DEL) $@
+$(OBJDIR)/cpp.opt: $(CPPOPT_DEPENDS)
+	$(CHK) $(subst /,\,$@) $(DEL) $(subst /,\,$@)
+	@echo CPPOPT_DEPENDS=$<
 	@echo Generating $@
 ifneq "$(strip $(CFLAGS))" ""
 	@echo $(CFLAGS) >> $@
@@ -169,13 +170,13 @@
 
 ifeq "$(words $(strip $(TARGET_lib)))" "1"
 
-$(TARGET_lib) : $(OBJDIR)\$(LIB_NAME)_lib.lst
+$(TARGET_lib) : $(OBJDIR)/$(LIB_NAME)_lib.lst
+	$(CHK) $(subst /,\,$@) $(DEL) $(subst /,\,$@)
 	@echo Generating $@
-	$(CHK) $(OBJDIR)\$(@F) $(DEL) $(OBJDIR)\$(@F)
-	$(LIB) -o $(OBJDIR)\$(@F) @$?
+	$(LIB) -o $(OBJDIR)/$(@F) @$?
 
-$(OBJDIR)\$(LIB_NAME)_lib.lst: $($(LIB_NAME)_LIBLST_DEPENDS)
-	$(CHK) $@ $(DEL) $@
+$(OBJDIR)/$(LIB_NAME)_lib.lst: $($(LIB_NAME)_LIBLST_DEPENDS)
+	$(CHK) $(subst /,\,$@) $(DEL) $(subst /,\,$@)
 	@echo Generating $@
 ifneq "$(strip $(FILES_lib_objs))" ""
 	@echo $(foreach objfile,$(FILES_lib_objs),$(subst /,\,$(objfile)) ) >> $@
@@ -183,7 +184,7 @@
 
 else # We must have more than one target library so load the individual makefiles
 
-$(OBJDIR)/%.lib: NWGNU% $(APR_WORK)\build\NWGNUhead.inc $(APR_WORK)\build\NWGNUtail.inc $(APR_WORK)\build\NWGNUenvironment.inc
FORCE
+$(OBJDIR)/%.lib: NWGNU% $(APR_WORK)/build/NWGNUhead.inc $(APR_WORK)/build/NWGNUtail.inc $(APR_WORK)/build/NWGNUenvironment.inc
FORCE
 	@echo Calling $<
 	$(MAKE) -f $< $(MAKECMDGOALS) RELEASE=$(RELEASE)
 
@@ -193,19 +194,19 @@
 # Rules to build nlms.
 #
 
-vpath libcpre.o $(NOVELLLIBC)\imports
+vpath libcpre.o $(NOVELLLIBC)/imports
 
 # If we only have one target NLM then build it
 ifeq "$(words $(strip $(TARGET_nlm)))" "1"
 
-$(TARGET_nlm) : $(FILES_nlm_objs) $(FILES_nlm_libs) $(OBJDIR)\$(NLM_NAME)_link.opt
+$(TARGET_nlm) : $(FILES_nlm_objs) $(FILES_nlm_libs) $(OBJDIR)/$(NLM_NAME)_link.opt
 	@echo Linking $@
-	$(LINK) @$(OBJDIR)\$(NLM_NAME)_link.opt
+	$(LINK) @$(OBJDIR)/$(NLM_NAME)_link.opt
 
 # This will force the link option file to be rebuilt if we change the
 # corresponding makefile
 
-$(OBJDIR)\$(NLM_NAME)_link.opt : $($(NLM_NAME)_LINKOPT_DEPENDS)
+$(OBJDIR)/$(NLM_NAME)_link.opt : $($(NLM_NAME)_LINKOPT_DEPENDS)
 	$(CHK) $(OBJDIR)\$(@F) $(DEL) $(OBJDIR)\$(@F)
 	$(CHK) $(OBJDIR)\$(NLM_NAME)_link.def $(DEL) $(OBJDIR)\$(NLM_NAME)_link.def
 	@echo Generating $@
@@ -230,14 +231,14 @@
 	@echo -l "$(METROWERKS)/Novell Support/Metrowerks Support/Libraries/Runtime" >> $@
 	@echo -l "$(METROWERKS)/Novell Support/Metrowerks Support/Libraries/MSL C++" >> $@
 ifneq "$(IPV6)" ""
-	@echo -l $(NOVELLLIBC)\include\winsock\IPV6 >> $@
+	@echo -l $(NOVELLLIBC)/include/winsock/IPV6 >> $@
 endif
 	@echo -l $(NOVELLLIBC)/imports >> $@
 ifneq "$(LDAPSDK)" ""
 	@echo -l $(LDAPSDK)/lib/nlm >> $@
 endif
 	@echo -nodefaults >> $@
-	@echo -map $(OBJDIR)\$(NLM_NAME).map>> $@
+	@echo -map $(OBJDIR)/$(NLM_NAME).map>> $@
 ifneq "$(strip $(XLFLAGS))" ""
 	@echo $(XLFLAGS) >> $@
 endif
@@ -310,7 +311,7 @@
 
 ifndef NO_LICENSE_FILE
 
-$(OBJDIR)/%.nlm: NWGNU% $(APR_WORK)\build\NWGNUhead.inc $(APR_WORK)\build\NWGNUtail.inc $(APR_WORK)\build\NWGNUenvironment.inc
$(CUSTOM_INI) $(VERSION_INC) FORCE
+$(OBJDIR)/%.nlm: NWGNU% $(APR_WORK)/build/NWGNUhead.inc $(APR_WORK)/build/NWGNUtail.inc $(APR_WORK)/build/NWGNUenvironment.inc
$(CUSTOM_INI) $(VERSION_INC) FORCE
 	@echo Calling $<
 	$(MAKE) -f $< $(MAKECMDGOALS) RELEASE=$(RELEASE)
 	$(CMD) echo.

Modified: apr/apr/trunk/dbd/NWGNUdbdfreetds
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/NWGNUdbdfreetds?rev=789137&r1=789136&r2=789137&view=diff
==============================================================================
--- apr/apr/trunk/dbd/NWGNUdbdfreetds (original)
+++ apr/apr/trunk/dbd/NWGNUdbdfreetds Sun Jun 28 18:30:34 2009
@@ -11,10 +11,10 @@
 #
 
 ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
 endif
 
-#include $(APR)\build\NWGNUcustom.inc
+#include $(APR)/build/NWGNUcustom.inc
 
 #
 # build this level's files
@@ -36,10 +36,9 @@
 # INCDIRS
 #
 XINCDIRS	+= \
-			$(APR)/include/arch/netware \
 			$(APR)/include \
 			$(APR)/include/private \
-			$(APR) \
+			$(APR)/include/arch/netware \
 			$(FREETDS_INC) \
 			$(EOLIST)
 
@@ -136,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	=
 
@@ -276,7 +275,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
 
@@ -289,7 +288,7 @@
 # in this makefile
 #
 
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APR_WORK)/build/NWGNUtail.inc
 
 
 

Modified: apr/apr/trunk/dbd/NWGNUdbdmysql
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/NWGNUdbdmysql?rev=789137&r1=789136&r2=789137&view=diff
==============================================================================
--- apr/apr/trunk/dbd/NWGNUdbdmysql (original)
+++ apr/apr/trunk/dbd/NWGNUdbdmysql Sun Jun 28 18:30:34 2009
@@ -11,10 +11,10 @@
 #
 
 ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
 endif
 
-#include $(APR)\build\NWGNUcustom.inc
+#include $(APR)/build/NWGNUcustom.inc
 
 #
 # build this level's files
@@ -36,10 +36,9 @@
 # INCDIRS
 #
 XINCDIRS	+= \
-			$(APR)/include/arch/netware \
 			$(APR)/include \
 			$(APR)/include/private \
-			$(APR) \
+			$(APR)/include/arch/netware \
 			$(MYSQL_INC) \
 			$(EOLIST)
 
@@ -137,7 +136,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 +276,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 +289,7 @@
 # in this makefile
 #
 
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APR_WORK)/build/NWGNUtail.inc
 
 
 

Modified: apr/apr/trunk/dbd/NWGNUdbdpgsql
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/NWGNUdbdpgsql?rev=789137&r1=789136&r2=789137&view=diff
==============================================================================
--- apr/apr/trunk/dbd/NWGNUdbdpgsql (original)
+++ apr/apr/trunk/dbd/NWGNUdbdpgsql Sun Jun 28 18:30:34 2009
@@ -11,10 +11,10 @@
 #
 
 ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
 endif
 
-#include $(APR)\build\NWGNUcustom.inc
+#include $(APR)/build/NWGNUcustom.inc
 
 #
 # build this level's files
@@ -36,10 +36,9 @@
 # INCDIRS
 #
 XINCDIRS	+= \
-			$(APR)/include/arch/netware \
 			$(APR)/include \
 			$(APR)/include/private \
-			$(APR) \
+			$(APR)/include/arch/netware \
 			$(PGSQL_INC) \
 			$(EOLIST)
 
@@ -137,7 +136,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 +276,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 +289,7 @@
 # in this makefile
 #
 
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APR_WORK)/build/NWGNUtail.inc
 
 
 

Modified: apr/apr/trunk/dbd/NWGNUdbdsqli2
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/NWGNUdbdsqli2?rev=789137&r1=789136&r2=789137&view=diff
==============================================================================
--- apr/apr/trunk/dbd/NWGNUdbdsqli2 (original)
+++ apr/apr/trunk/dbd/NWGNUdbdsqli2 Sun Jun 28 18:30:34 2009
@@ -11,10 +11,10 @@
 #
 
 ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
 endif
 
-#include $(APR)\build\NWGNUcustom.inc
+#include $(APR)/build/NWGNUcustom.inc
 
 #
 # build this level's files
@@ -36,10 +36,9 @@
 # INCDIRS
 #
 XINCDIRS	+= \
-			$(APR)/include/arch/netware \
 			$(APR)/include \
 			$(APR)/include/private \
-			$(APR) \
+			$(APR)/include/arch/netware \
 			$(SQLITE2_INC) \
 			$(EOLIST)
 
@@ -136,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	=
 
@@ -276,7 +275,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
 
@@ -289,7 +288,7 @@
 # in this makefile
 #
 
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APR_WORK)/build/NWGNUtail.inc
 
 
 

Modified: apr/apr/trunk/dbd/NWGNUdbdsqli3
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/NWGNUdbdsqli3?rev=789137&r1=789136&r2=789137&view=diff
==============================================================================
--- apr/apr/trunk/dbd/NWGNUdbdsqli3 (original)
+++ apr/apr/trunk/dbd/NWGNUdbdsqli3 Sun Jun 28 18:30:34 2009
@@ -11,10 +11,10 @@
 #
 
 ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
 endif
 
-#include $(APR)\build\NWGNUcustom.inc
+#include $(APR)/build/NWGNUcustom.inc
 
 #
 # build this level's files
@@ -36,10 +36,9 @@
 # INCDIRS
 #
 XINCDIRS	+= \
-			$(APR)/include/arch/netware \
 			$(APR)/include \
 			$(APR)/include/private \
-			$(APR) \
+			$(APR)/include/arch/netware \
 			$(SQLITE3_INC) \
 			$(EOLIST)
 
@@ -291,7 +290,7 @@
 # in this makefile
 #
 
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APR_WORK)/build/NWGNUtail.inc
 
 
 

Modified: apr/apr/trunk/dbd/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/NWGNUmakefile?rev=789137&r1=789136&r2=789137&view=diff
==============================================================================
--- apr/apr/trunk/dbd/NWGNUmakefile (original)
+++ apr/apr/trunk/dbd/NWGNUmakefile Sun Jun 28 18:30:34 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
@@ -155,10 +155,8 @@
 	$(EOLIST)
 
 ifeq "$(APU_HAVE_MYSQL)" "1"
-ifeq "$(wildcard apr_dbd_mysql.c)" "apr_dbd_mysql.c"
 TARGET_nlm += $(OBJDIR)/dbdmysql.nlm $(OBJDIR)/dbdmysql.nlm $(EOLIST)
 endif
-endif
 ifeq "$(APU_HAVE_PGSQL)" "1"
 TARGET_nlm += $(OBJDIR)/dbdpgsql.nlm $(OBJDIR)/dbdpgsql.nlm $(EOLIST)
 endif
@@ -257,6 +255,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=789137&r1=789136&r2=789137&view=diff
==============================================================================
--- apr/apr/trunk/ldap/NWGNUmakefile (original)
+++ apr/apr/trunk/ldap/NWGNUmakefile Sun Jun 28 18:30:34 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
@@ -107,7 +107,7 @@
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME		= 
+NLM_NAME	= 
 
 #
 # This is used by the link '-desc ' directive. 
@@ -122,9 +122,9 @@
 NLM_THREAD_NAME	= 
 #
 # If this is specified, it will override VERSION value in 
-# $(APR_WORK)\build\NWGNUenvironment.inc
+# $(APR_WORK)/build/NWGNUenvironment.inc
 #
-NLM_VERSION		=
+NLM_VERSION	=
 
 #
 # If this is specified, it will override the default of 64K
@@ -149,14 +149,14 @@
 #
 # If this is specified it will be used by the link '-flags' directive
 #
-NLM_FLAGS		=
+NLM_FLAGS	=
  
 #
 # 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)
@@ -245,7 +245,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
 
@@ -258,5 +258,5 @@
 # in this makefile
 #
 
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APR_WORK)/build/NWGNUtail.inc
 

Modified: apr/apr/trunk/xml/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/trunk/xml/NWGNUmakefile?rev=789137&r1=789136&r2=789137&view=diff
==============================================================================
--- apr/apr/trunk/xml/NWGNUmakefile (original)
+++ apr/apr/trunk/xml/NWGNUmakefile Sun Jun 28 18:30:34 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
@@ -103,7 +103,7 @@
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME		= 
+NLM_NAME	= 
 
 #
 # This is used by the link '-desc ' directive. 
@@ -118,9 +118,9 @@
 NLM_THREAD_NAME	= 
 #
 # If this is specified, it will override VERSION value in 
-# $(APR_WORK)\build\NWGNUenvironment.inc
+# $(APR_WORK)/build/NWGNUenvironment.inc
 #
-NLM_VERSION		=
+NLM_VERSION	=
 
 #
 # If this is specified, it will override the default of 64K
@@ -145,14 +145,14 @@
 #
 # If this is specified it will be used by the link '-flags' directive
 #
-NLM_FLAGS		=
+NLM_FLAGS	=
  
 #
 # 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)
@@ -218,7 +218,7 @@
 #
 FILES_nlm_exports = \
 	$(EOLIST)
-	
+
 #   
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
@@ -240,7 +240,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
 
@@ -255,5 +255,5 @@
 # in this makefile
 #
 
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APR_WORK)/build/NWGNUtail.inc
 



Mime
View raw message