NetWare build overhaul in order to compile on Linux.

Take 1.


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

1 files changed, 45 insertions, 46 deletions

diff --git a/build/NWGNUmakefile b/build/NWGNUmakefile
index ac3aeee311..401b3da3d2 100644
--- a/build/NWGNUmakefile
+++ b/build/NWGNUmakefile
@@ -25,54 +25,53 @@ FILES_prebuild_headers = \
 nlms :: chkapr $(NWOS)/httpd.imp $(NWOS)/chartables.c
 
 $(NWOS)/httpd.imp : make_nw_export.awk nw_export.i
-	@echo Generating $(subst /,\,$@)
-	$(AWK) -v EXPPREFIX=AP$(VERSION_MAJMIN) -f $^ | sort >$@
+	@echo $(DL)GEN  $@$(DL)
+	$(AWK) -v EXPPREFIX=AP$(VERSION_MAJMIN) -f $^ | $(SORT) >$@
     
 nw_export.i : nw_export.inc $(FILES_prebuild_headers) cc.opt
-	@echo Generating $(subst /,\,$@)
+	@echo $(DL)GEN  $@$(DL)
 	$(CC) $< @cc.opt
 
-cc.opt : NWGNUmakefile $(AP_WORK)\build\NWGNUenvironment.inc $(AP_WORK)\build\NWGNUtail.inc $(AP_WORK)\build\NWGNUhead.inc
-	$(CHK) $@ $(DEL) $@
-	@echo -P >> $@
-	@echo -EP >> $@
-	@echo -nosyspath >> $@
-	@echo -w nocmdline >> $@
-	@echo $(DEFINES) >> $@
-	@echo -I..\include >> $@
-	@echo -I..\modules\http >> $@
-	@echo -I..\modules\aaa >> $@
-	@echo -I..\modules\core >> $@
-	@echo -I..\os\netware >> $@
-	@echo -I..\server\mpm\netware >> $@
-	@echo -I$(APR)\include >> $@
-	@echo -I$(APRUTIL)\include >> $@
-	@echo -ir $(NOVELLLIBC) >> $@
-
-$(PCRE)/%.h: $(subst /,\,$(PCRE))\%.h.generic
-	@echo Creating $(subst /,\,$@)
-	copy $< $(subst /,\,$(PCRE))\$(@F)
-
-$(PCRE)/%.h: $(subst /,\,$(PCRE))\%.hw
-	@echo Creating $(subst /,\,$@)
-	copy $< $(subst /,\,$(PCRE))\$(@F)
+cc.opt : NWGNUmakefile $(APBUILD)/NWGNUenvironment.inc $(APBUILD)/NWGNUtail.inc $(APBUILD)/NWGNUhead.inc
+	@echo $(DL)-P$(DL)> $@
+	@echo $(DL)-EP$(DL)>> $@
+	@echo $(DL)-nosyspath$(DL)>> $@
+	@echo $(DL)-w nocmdline$(DL)>> $@
+	@echo $(DL)$(DEFINES)$(DL)>> $@
+	@echo $(DL)-I$(SRC)/include$(DL)>> $@
+	@echo $(DL)-I$(HTTPD)$(DL)>> $@
+	@echo $(DL)-I$(STDMOD)/aaa$(DL)>> $@
+	@echo $(DL)-I$(STDMOD)/core$(DL)>> $@
+	@echo $(DL)-I$(NWOS)$(DL)>> $@
+	@echo $(DL)-I$(SERVER)/mpm/netware$(DL)>> $@
+	@echo $(DL)-I$(APR)/include$(DL)>> $@
+	@echo $(DL)-I$(APRUTIL)/include$(DL)>> $@
+	@echo $(DL)-ir $(NOVELLLIBC)$(DL)>> $@
+
+$(PCRE)/%.h: $(PCRE)/%.h.generic
+	@echo Creating $@
+	$(call COPY,$<,$@)
+
+$(PCRE)/%.h: $(PCRE)/%.hw
+	@echo Creating $@
+	$(call COPY,$<,$@)
 
 ifneq "$(BUILDTOOL_AS_NLM)" "1"
 
 $(NWOS)/chartables.c: dftables.exe $(PCRE)/dftables.c $(FILES_prebuild_headers)
-	@echo Creating $(subst /,\,$@)
+	@echo $(DL)GEN  $@$(DL)
 	@$< $@
 
 %.exe: $(PCRE)/%.c
-	@echo Creating Build Helper $@
+	@echo $(DL)Creating Build Helper $@$(DL)
 	@$(WIN_CC) $(WIN_CFLAGS) -DHAVE_CONFIG_H $< -o $@
 
-$(NWOS)/test_char.h: gen_test_char.exe $(AP_WORK)/server/gen_test_char.c
-	@echo Creating $(subst /,\,$@)
+$(NWOS)/test_char.h: gen_test_char.exe $(SERVER)/gen_test_char.c
+	@echo $(DL)GEN  $@$(DL)
 	@$< > $@
 
-%.exe: $(AP_WORK)/server/%.c
-	@echo Creating Build Helper $@
+%.exe: $(SERVER)/%.c
+	@echo $(DL)Creating Build Helper $@$(DL)
 	@$(WIN_CC) $(WIN_CFLAGS) -DCROSS_COMPILE $< -o $@
 
 else
@@ -90,8 +89,8 @@ endif
 #
 # Check for minimum APR version
 #
-chkapr: $(APR)\build\nw_ver.awk $(APR)\include\apr_version.h
-	@echo Checking for APR version...
+chkapr: $(APR)/build/nw_ver.awk $(APR)/include/apr_version.h
+	@echo $(DL)Checking for APR version...$(DL)
 	@$(AWK) -v WANTED=$(APR_WANTED) -f $^
 
 #
@@ -101,17 +100,17 @@ chkapr: $(APR)\build\nw_ver.awk $(APR)\include\apr_version.h
 install :: nlms FORCE
 
 clean ::
-	$(CHK) $(subst /,\,$(PCRE))\config.h               $(DEL) $(subst /,\,$(PCRE))\config.h
-	$(CHK) $(subst /,\,$(PCRE))\pcre.h                 $(DEL) $(subst /,\,$(PCRE))\pcre.h
-	$(CHK) $(subst /,\,$(NWOS))\httpd.imp              $(DEL) $(subst /,\,$(NWOS))\httpd.imp
-	$(CHK) nw_export.i                                 $(DEL) nw_export.i
-	$(CHK) cc.opt                                      $(DEL) cc.opt
-	$(CHK) NWGNUversion.inc                            $(DEL) NWGNUversion.inc
+	$(call DEL,$(PCRE)/config.h)
+	$(call DEL,$(PCRE)/pcre.h)
+	$(call DEL,$(NWOS)/httpd.imp)
+	$(call DEL,nw_export.i)
+	$(call DEL,cc.opt)
+	$(call DEL,NWGNUversion.inc)
 ifneq "$(BUILDTOOL_AS_NLM)" "1"
-	$(CHK) $(subst /,\,$(NWOS))\chartables.c           $(DEL) $(subst /,\,$(NWOS))\chartables.c
-	$(CHK) $(subst /,\,$(NWOS))\test_char.h            $(DEL) $(subst /,\,$(NWOS))\test_char.h
-	$(CHK) dftables.exe                                $(DEL) dftables.exe
-	$(CHK) gen_test_char.exe                           $(DEL) gen_test_char.exe
+	$(call DEL,$(NWOS)/chartables.c)
+	$(call DEL,$(NWOS)/test_char.h)
+	$(call DEL,dftables.exe)
+	$(call DEL,gen_test_char.exe)
 endif
 
 #
@@ -119,5 +118,5 @@ endif
 # in this makefile
 #
 
-include $(AP_WORK)/build/NWGNUtail.inc
+include $(APBUILD)/NWGNUtail.inc