NetWare build overhaul in order to compile on Linux.

the remaining bits ...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1087555 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/NWGNUmakefile b/NWGNUmakefile
index 4e30e2cb5f4892b1a252ab54ca903fcce7bbc332..097c66f954ab52c6099e92e2b7fc146118448774 100644 (file)
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -412,8 +412,6 @@ installdev :: FORCE
        $(call COPY,$(NWOS)/*.h,                                       $(INSTALLBASE)/include/)
        $(call COPY,$(APR)/include/*.h,                                $(INSTALLBASE)/include/)
        $(call COPY,$(APRUTIL)/include/*.h,                            $(INSTALLBASE)/include/)
-       $(call COPY,$(STDMOD)/core/mod_so.h,                           $(INSTALLBASE)/include/)
-       $(call COPY,$(STDMOD)/core/mod_watchdog.h,                     $(INSTALLBASE)/include/)
        $(call COPY,$(STDMOD)/cache/mod_cache.h,                       $(INSTALLBASE)/include/)
        $(call COPY,$(STDMOD)/database/mod_dbd.h,                      $(INSTALLBASE)/include/)
        $(call COPY,$(STDMOD)/dav/main/mod_dav.h,                      $(INSTALLBASE)/include/)
@@ -423,8 +421,6 @@ installdev :: FORCE
        $(call COPY,$(STDMOD)/loggers/mod_log_config.h,                $(INSTALLBASE)/include/)
        $(call COPY,$(STDMOD)/mappers/mod_rewrite.h,                   $(INSTALLBASE)/include/)
        $(call COPY,$(STDMOD)/proxy/mod_proxy.h,                       $(INSTALLBASE)/include/)
-       $(call COPY,$(STDMOD)/proxy/mod_serf.h,                        $(INSTALLBASE)/include/)
-       $(call COPY,$(STDMOD)/session/mod_session.h,                   $(INSTALLBASE)/include/)
        $(call COPY,$(STDMOD)/ssl/mod_ssl.h,                           $(INSTALLBASE)/include/)
        $(call COPY,$(APR)/*.imp,                                      $(INSTALLBASE)/lib/)
        $(call COPY,$(NWOS)/*.imp,                                     $(INSTALLBASE)/lib/)

diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc
index 713264d92bf29e42943d3e69735c665bb98d1971..a8f0befb45dcadb06141fbdc34881efd4ee724fc 100644 (file)
--- a/build/NWGNUenvironment.inc
+++ b/build/NWGNUenvironment.inc
@@ -132,6 +132,7 @@ WIN_CC      = mwcc
 
 # Setup build tools
 AWK    = awk
+TOUCH  = touch
 
 # Setup distribution tools
 ZIP    = zip -qr9

diff --git a/modules/dav/fs/NWGNUmakefile b/modules/dav/fs/NWGNUmakefile
index c5cf297b2f661a0fdc42ff4a6485b57541bcda99..21c2056944c016ef25a36a89728d8f8b99f287a5 100644 (file)
--- a/modules/dav/fs/NWGNUmakefile
+++ b/modules/dav/fs/NWGNUmakefile
@@ -252,7 +252,8 @@ nlms :: libs $(TARGET_nlm)
 # correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-       copy $(OBJDIR)\moddavfs.nlm $(INSTALL)\$(BASEDIR)\modules
+       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/)
+
 #
 # Any specialized rules here
 #

diff --git a/modules/dav/lock/NWGNUmakefile b/modules/dav/lock/NWGNUmakefile
index 193370668082a091377694a4cef14fec7b43cae9..d5494b5587f07ce32519202693c39cd8c389a759 100644 (file)
--- a/modules/dav/lock/NWGNUmakefile
+++ b/modules/dav/lock/NWGNUmakefile
@@ -243,7 +243,8 @@ nlms :: libs $(TARGET_nlm)
 # correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-       copy $(OBJDIR)\moddavlk.nlm $(INSTALL)\$(BASEDIR)\modules
+       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/)
+
 #
 # Any specialized rules here
 #

diff --git a/modules/dav/main/NWGNUmakefile b/modules/dav/main/NWGNUmakefile
index a66665d34cd9a729b9db038666a92ba84186f747..bb37b6962de3b49e8e50bee736f7f002cfc14bbf 100644 (file)
--- a/modules/dav/main/NWGNUmakefile
+++ b/modules/dav/main/NWGNUmakefile
@@ -252,8 +252,8 @@ nlms :: libs $(TARGET_nlm)
 # correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-       copy $(OBJDIR)\mod_dav.nlm $(INSTALL)\$(BASEDIR)\modules\*.*
-    
+       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/)
+
 #
 # Any specialized rules here
 #

diff --git a/modules/ssl/NWGNUmakefile b/modules/ssl/NWGNUmakefile
index f674b0df1dae02c10c55187b4a3ce7317a80f6f2..585cb48d854cbb67dcaea400b095a3e0f290fef0 100644 (file)
--- a/modules/ssl/NWGNUmakefile
+++ b/modules/ssl/NWGNUmakefile
@@ -269,10 +269,10 @@ nlms :: libs $(TARGET_nlm)
 # correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-       copy $(OBJDIR)\mod_ssl.nlm $(INSTALL)\$(BASEDIR)\modules\*.*
-       -copy $(subst /,\,$(OSSLLIB))\openssl.nlm $(INSTALL)\$(BASEDIR)\bin\*.*
-       -copy $(subst /,\,$(OSSLAPP))\openssl.cnf $(INSTALL)\$(BASEDIR)\bin\*.*
-    
+       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/)
+       $(call COPY,$(OSSLLIB)/openssl.nlm ,$(INSTALLBASE)/bin/)
+       $(call COPY,$(OSSLAPP)/openssl.cnf ,$(INSTALLBASE)/bin/)
+
 #
 # Any specialized rules here
 #
@@ -282,11 +282,11 @@ vpath %.c $(AP_WORK)/modules/arch/netware
 # This requires a 'touch' utility.  Can be downloaded from 'coreutils' at
 #  http://sourceforge.net/projects/gnuwin32/
 ssl_expr_parse.h : ssl_expr_parse.y
-       touch ssl_expr_parse.h
+       $(TOUCH) touch ssl_expr_parse.h
 ssl_expr_parse.c : ssl_expr_parse.y
-       touch ssl_expr_parse.c
+       $(TOUCH) ssl_expr_parse.c
 ssl_expr_scan.c : ssl_expr_scan.l
-       touch ssl_expr_scan.c
+       $(TOUCH) ssl_expr_scan.c
 
 #
 # Include the 'tail' makefile that has targets that depend on variables defined

diff --git a/support/NWGNUmakefile b/support/NWGNUmakefile
index 8c9d3d036e0afc7c02ee753d5a96fdd9693ddc0d..7d5902d2af1f74100f0a4608fc622280cc6b5c82 100644 (file)
--- a/support/NWGNUmakefile
+++ b/support/NWGNUmakefile
@@ -235,7 +235,7 @@ nlms :: libs $(TARGET_nlm)
 # correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)
 #
 install :: nlms FORCE
-       copy $(OBJDIR)\*.nlm $(INSTALL)\$(BASEDIR)\bin\*.*
+       $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/bin/)
 
 #
 # Any specialized rules here