NetWare build overhaul in order to compile on Linux.

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

1 files changed, 65 insertions, 29 deletions

diff --git a/build/NWGNUtail.inc b/build/NWGNUtail.inc
index 63dfeb591..60215b6f5 100644
--- a/build/NWGNUtail.inc
+++ b/build/NWGNUtail.inc
@@ -85,7 +85,8 @@ endif
 
 ifneq ($(MAKECMDGOALS),clean)
 $(APRBUILD)/NWGNUversion.inc : $(APRBUILD)/nw_ver.awk $(APR)/include/apr_version.h
-	@echo Generating $@
+#	@echo Generating $@
+	@echo GEN  $@
 	@$(AWK) -f $^ > $@
 
 -include $(APRBUILD)/NWGNUversion.inc
@@ -112,13 +113,19 @@ endif
 ifeq "$(INCLUDE_BLDCMDS)" "1"
 
 $(OBJDIR)/%.o: %.c $(OBJDIR)/$(CCOPT_NAME)_cc.opt
-	@echo Compiling $<
+#	@echo Compiling $<
+	@echo CC   $<
 	$(CC) -o $@ $< @$(word 2, $^)
 
 $(OBJDIR)/$(CCOPT_NAME)_cc.opt: $(CCOPT_DEPENDS)
+ifeq "$(OSTYPE)" "linux"
+	$(DEL) $@
+else
 	$(CHK) $(subst /,\,$@) $(DEL) $(subst /,\,$@)
-	@echo CCOPT_DEPENDS=$^
-	@echo Generating $@
+endif
+#	@echo CCOPT_DEPENDS=$^
+#	@echo Generating $@
+	@echo GEN  $@
 ifneq "$(strip $(CFLAGS))" ""
 	@echo $(CFLAGS) >> $@
 endif
@@ -139,13 +146,19 @@ ifneq "$(strip $(XDEFINES))" ""
 endif
 
 $(OBJDIR)/%.o: %.cpp $(OBJDIR)/$(CCOPT_NAME)_cpp.opt
-	@echo Compiling $<
+#	@echo Compiling $<
+	@echo CC   $<
 	$(CCP) -o $@ $< @$(word 2, $^)
 
 $(OBJDIR)/$(CCOPT_NAME)_cpp.opt: $(CPPOPT_DEPENDS)
+ifeq "$(OSTYPE)" "linux"
+	$(DEL) $@
+else
 	$(CHK) $(subst /,\,$@) $(DEL) $(subst /,\,$@)
+endif
 	@echo CPPOPT_DEPENDS=$^
-	@echo Generating $@
+#	@echo Generating $@
+	@echo GEN  $@
 ifneq "$(strip $(CFLAGS))" ""
 	@echo $(CFLAGS) >> $@
 endif
@@ -176,14 +189,24 @@ endif # one target nlm or lib
 ifeq "$(words $(strip $(TARGET_lib)))" "1"
 
 $(TARGET_lib) : $(OBJDIR)/$(LIB_NAME)_lib.lst
+ifeq "$(OSTYPE)" "linux"
+	$(DEL) $@
+else
 	$(CHK) $(subst /,\,$@) $(DEL) $(subst /,\,$@)
-	@echo Generating $@
+endif
+#	@echo Generating $@
+	@echo AR   $@
 	$(LIB) -o $@ @$<
 
 $(OBJDIR)/aprlib_lib.lst: $(aprlib_LIBLST_DEPENDS)
+ifeq "$(OSTYPE)" "linux"
+	$(DEL) $@
+else
 	$(CHK) $(subst /,\,$@) $(DEL) $(subst /,\,$@)
+endif
 ifneq "$(strip $(FILES_lib_objs))" ""
-	@echo Generating $@
+#	@echo Generating $@
+	@echo GEN  $@
 	@echo $(wordlist 1, 10, $(FILES_lib_objs)) >> $@
 	@echo $(wordlist 11, 20, $(FILES_lib_objs)) >> $@
 	@echo $(wordlist 21, 30, $(FILES_lib_objs)) >> $@
@@ -198,10 +221,14 @@ ifneq "$(strip $(FILES_lib_objs))" ""
 endif
 
 $(OBJDIR)/%_lib.lst: $($(LIB_NAME)_LIBLST_DEPENDS)
+ifeq "$(OSTYPE)" "linux"
+	$(DEL) $@
+else
 	$(CHK) $(subst /,\,$@) $(DEL) $(subst /,\,$@)
+endif
 ifneq "$(strip $(FILES_lib_objs))" ""
-	@echo Generating $@
-	@echo CWD $(CURDIR)
+#	@echo Generating $@
+	@echo GEN  $@
 	@echo $(FILES_lib_objs) >> $@
 endif
 
@@ -223,16 +250,23 @@ vpath libcpre.o $(NOVELLLIBC)/imports
 ifeq "$(words $(strip $(TARGET_nlm)))" "1"
 
 $(TARGET_nlm) : $(FILES_nlm_objs) $(FILES_nlm_libs) $(OBJDIR)/$(NLM_NAME)_link.opt
-	@echo Linking $@
+#	@echo Linking $@
+	@echo LINK $@
 	$(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)
+ifeq "$(OSTYPE)" "linux"
+	$(DEL) $@
+	$(DEL) $(@:.opt=.def)
+else
 	$(CHK) $(subst /,\,$@) $(DEL) $(subst /,\,$@)
 	$(CHK) $(subst /,\,$(@:.opt=.def)) $(DEL) $(subst /,\,$(@:.opt=.def))
-	@echo Generating $@
+endif
+#	@echo Generating $@
+	@echo GEN  $@
 	@echo -warnings off >> $@
 	@echo -zerobss >> $@
 	@echo -o $(TARGET_nlm) >> $@
@@ -251,14 +285,15 @@ endif
 	@echo -l $(APRBUCKETS)/$(OBJDIR) >> $@
 	@echo -l $(APRLDAP)/$(OBJDIR) >> $@
 	@echo -l $(APRXML)/$(OBJDIR) >> $@
-	@echo -l "$(METROWERKS)/Novell Support/Metrowerks Support/Libraries/Runtime" >> $@
-	@echo -l "$(METROWERKS)/Novell Support/Metrowerks Support/Libraries/MSL C++" >> $@
+	@echo -l $(APR)/misc/netware >> $@
+	@echo $(DL)-l "$(METROWERKS)/Novell Support/Metrowerks Support/Libraries/Runtime"$(DL) >> $@
+	@echo $(DL)-l "$(METROWERKS)/Novell Support/Metrowerks Support/Libraries/MSL C++"$(DL) >> $@
 ifneq "$(IPV6)" ""
 	@echo -l $(NOVELLLIBC)/include/winsock/IPV6 >> $@
 endif
 	@echo -l $(NOVELLLIBC)/imports >> $@
 ifneq "$(LDAPSDK)" ""
-	@echo -l $(LDAPSDK)/lib/nlm >> $@
+	@echo -l $(LDAPSDK)/imports >> $@
 endif
 	@echo -nodefaults >> $@
 	@echo -map $(OBJDIR)/$(NLM_NAME).map>> $@
@@ -266,14 +301,14 @@ ifneq "$(strip $(XLFLAGS))" ""
 	@echo $(XLFLAGS) >> $@
 endif
 ifneq "$(strip $(FILES_nlm_objs))" ""
-	@echo $(foreach objfile,$(strip $(FILES_nlm_objs)),$(subst /,\,$(objfile))) >> $@
+	@echo $(foreach objfile,$(strip $(FILES_nlm_objs)),$(objfile)) >> $@
 endif
 ifneq "$(FILES_nlm_libs)" ""
-	@echo $(foreach libfile, $(notdir $(strip $(FILES_nlm_libs))),-l$(subst /,\,$(libfile))) >> $@
+	@echo $(foreach libfile, $(notdir $(strip $(FILES_nlm_libs))),-l$(libfile)) >> $@
 endif
 	@echo -commandfile $(@:.opt=.def) >> $@
-	@echo # Do not edit this file - it is created by make! > $(@:.opt=.def)
-	@echo # All your changes will be lost!! >> $(@:.opt=.def)
+	@echo $(DL)# Do not edit this file - it is created by make!$(DL) > $(@:.opt=.def)
+	@echo $(DL)# All your changes will be lost!!$(DL) >> $(@:.opt=.def)
 ifneq "$(FILE_nlm_msg)" ""
 	@echo Messages $(FILE_nlm_msg) >> $(@:.opt=.def)
 endif
@@ -281,16 +316,16 @@ ifneq "$(FILE_nlm_hlp)" ""
 	@echo Help $(FILE_nlm_hlp) >> $(@:.opt=.def)
 endif
 ifeq "$(FILE_nlm_copyright)" ""
-	@echo copyright "$(NLM_COPYRIGHT)" >> $(@:.opt=.def)
+	@echo $(DL)copyright "$(NLM_COPYRIGHT)"$(DL) >> $(@:.opt=.def)
 endif
-	@echo description "$(NLM_DESCRIPTION)" >> $(@:.opt=.def)
-	@echo threadname "$(NLM_THREAD_NAME)" >> $(@:.opt=.def)
+	@echo $(DL)description "$(NLM_DESCRIPTION)"$(DL) >> $(@:.opt=.def)
+	@echo $(DL)threadname "$(NLM_THREAD_NAME)"$(DL) >> $(@:.opt=.def)
 ifneq "$(NLM_STACK_SIZE)" ""
 	@echo stacksize $(subst K,000,$(subst k,K,$(strip $(NLM_STACK_SIZE)))) >> $(@:.opt=.def)
 else
 	@echo stacksize 64000 >> $(@:.opt=.def)
 endif
-	@echo screenname "$(NLM_SCREEN_NAME)" >> $(@:.opt=.def)
+	@echo $(DL)screenname "$(NLM_SCREEN_NAME)"$(DL) >> $(@:.opt=.def)
 ifneq "$(NLM_VERSION)" ""
 	@echo version $(NLM_VERSION) >> $(@:.opt=.def)
 else
@@ -309,13 +344,13 @@ ifneq "$(NLM_FLAGS)" ""
 	@echo $(strip $(NLM_FLAGS)) >> $(@:.opt=.def)
 endif
 ifneq "$(FILES_nlm_modules)" ""
-	@echo module $(foreach module,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_modules))),$(subst /,\,$(module))) >> $(@:.opt=.def)
+	@echo module $(foreach module,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_modules))),$(module)) >> $(@:.opt=.def)
 endif
 ifneq "$(FILES_nlm_Ximports)" ""
-	@echo import $(foreach import,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_Ximports))),$(subst /,\,$(import))) >> $(@:.opt=.def)
+	@echo import $(foreach import,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_Ximports))),$(import)) >> $(@:.opt=.def)
 endif
 ifneq "$(FILES_nlm_exports)" ""
-	@echo export $(foreach export,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_exports))),$(subst /,\,$(export))) >> $(@:.opt=.def)
+	@echo export $(foreach export,$(subst $(SPACE),$(COMMA),$(strip $(FILES_nlm_exports))),$(export)) >> $(@:.opt=.def)
 endif
 
 # if APACHE_UNIPROC is defined, don't include XDCData
@@ -323,7 +358,7 @@ ifndef APACHE_UNIPROC
 ifneq "$(string $(XDCDATA))" ""
 	@echo xdcdata $(XDCDATA) >> $(@:.opt=.def)
 else
-	@echo xdcdata $(APR)/misc/netware/apr.xdc >> $(@:.opt=.def)
+	@echo xdcdata apr.xdc >> $(@:.opt=.def)
 endif
 endif
 
@@ -337,7 +372,7 @@ ifndef NO_LICENSE_FILE
 $(OBJDIR)/%.nlm: NWGNU% $(APRBUILD)/NWGNUhead.inc $(APRBUILD)/NWGNUtail.inc $(APRBUILD)/NWGNUenvironment.inc $(CUSTOM_INI) $(VERSION_INC) FORCE
 	@echo Calling $<
 	$(MAKE) -f $< $(MAKECMDGOALS) RELEASE=$(RELEASE)
-	$(CMD) echo.
+	@$(ECHONL)
 
 else
 
@@ -348,6 +383,7 @@ endif # NO_LICENSE_FILE
 endif # multiple targets
 
 $(INSTDIRS) ::
-	$(CHKNOT) $@\NUL mkdir $@
+#	$(CHKNOT) $@\NUL mkdir $@
+	-$(MD) $@