more NetWare build tweaks.

git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@789137 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 76 insertions, 72 deletions

diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc
index 624f1535f..5b9a8c792 100644
--- a/build/NWGNUenvironment.inc
+++ b/build/NWGNUenvironment.inc
@@ -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 @@ CPP	= mwccnlm
 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 @@ endif
 #
 # 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 @@ CHKNOT	= $(CMD) if not exist
 # 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
diff --git a/build/NWGNUhead.inc b/build/NWGNUhead.inc
index 17f149cad..7f6d2bec0 100644
--- a/build/NWGNUhead.inc
+++ b/build/NWGNUhead.inc
@@ -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
diff --git a/build/NWGNUmakefile b/build/NWGNUmakefile
index 0e8745034..4520584ce 100644
--- a/build/NWGNUmakefile
+++ b/build/NWGNUmakefile
@@ -10,7 +10,7 @@ SUBDIRS = \
 # paths to tools
 #
 
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
 
 #
 # build this level's files
@@ -22,50 +22,50 @@ FILES_prebuild_headers = \
 	$(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 @@ $(APRXML)/expat/lib/%.h: $(APRXML)/expat/lib/%.h.in
 # installation area
 #
 install :: nlms FORCE
-	
+
 
 clean ::
 	$(CHK) nw_export.i                                          $(DEL) nw_export.i
@@ -89,7 +89,7 @@ clean ::
 	$(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
     
diff --git a/build/NWGNUtail.inc b/build/NWGNUtail.inc
index 5ed49c9d3..4d1fe581e 100644
--- a/build/NWGNUtail.inc
+++ b/build/NWGNUtail.inc
@@ -33,38 +33,38 @@ endif
 #
 
 
-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 @@ endif
 # 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 @@ endif
 
 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 @@ ifneq "$(strip $(XDEFINES))" ""
 	@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 @@ endif # one target nlm
 
 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 @@ endif
 
 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 @@ endif
 # 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 @@ endif
 	@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 @@ else # more than one target so look for individual makefiles.
 
 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.