Another NetWare makefile cleanup.

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

diff --git a/NWGNUmakefile b/NWGNUmakefile
index 9db13001f7644bddd8b977971821a8eaf1ecb872..f91b8f424e9ed2be0d9b97a6e5b5986666115abe 100644 (file)
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -62,15 +62,15 @@ XINCDIRS    += \
                        $(APR)/include \
                        $(APRUTIL)/include \
                        $(AP_WORK)/include \
-                       $(AP_WORK)/modules/aaa/ \
-                       $(AP_WORK)/modules/core \
-                       $(AP_WORK)/modules/filters/ \
-                       $(AP_WORK)/modules/generators/ \
-                       $(AP_WORK)/modules/http/ \
-                       $(AP_WORK)/modules/loggers/ \
-                       $(AP_WORK)/modules/mappers/ \
-                       $(AP_WORK)/modules/proxy/ \
-                       $(AP_WORK)/modules/ssl/ \
+                       $(STDMOD)/aaa \
+                       $(STDMOD)/core \
+                       $(STDMOD)/filters \
+                       $(STDMOD)/generators \
+                       $(STDMOD)/http \
+                       $(STDMOD)/loggers \
+                       $(STDMOD)/mappers \
+                       $(STDMOD)/proxy \
+                       $(STDMOD)/ssl \
                        $(AP_WORK)/server/mpm/netware \
                        $(PCRE) \
                        $(NWOS) \
@@ -158,7 +158,7 @@ NLM_DESCRIPTION     = Apache Web Server $(VERSION_STR) $(VERSION_SKT)
 # This is used by the '-threadname' directive.  If left blank,
 # NLM_NAME Thread will be used.
 #
-NLM_THREAD_NAME        = Apache
+NLM_THREAD_NAME        = $(NLM_NAME)
 
 #
 # This is used by the '-screenname' directive.  If left blank,
@@ -210,7 +210,7 @@ XDCDATA             =
 # If there is an NLM target, put it here
 #
 TARGET_nlm = \
-       $(OBJDIR)/Apache2.nlm \
+       $(OBJDIR)/$(NLM_NAME).nlm \
        $(EOLIST)
 
 #
@@ -431,9 +431,9 @@ installdev :: FORCE
        -copy $(subst /,\,$(NWOS))\*.xdc           $(INSTALL)\$(BASEDIR)\lib\*.*
 
 prebuild :: FORCE
-       $(MAKE) -C server -f NWGNUmakefile
-       $(MAKE) -C srclib/pcre -f NWGNUmakefile
-       $(CHKNOT) $(PREBUILD_INST)\nul          mkdir $(PREBUILD_INST)
+       $(MAKE) -C $(SERVER) -f NWGNUmakefile
+       $(MAKE) -C $(PCRE) -f NWGNUmakefile
+       $(CHKNOT) $(subst /,\,$(PREBUILD_INST))\nul mkdir $(subst /,\,$(PREBUILD_INST))
        -copy $(AP_WORK)\server\$(OBJDIR)\*.nlm $(PREBUILD_INST)\*.*
        -copy $(PCRE)\$(basename $(OBJDIR))\*.nlm $(PREBUILD_INST)\*.*
 

diff --git a/modules/aaa/NWGNUauthbasc b/modules/aaa/NWGNUauthbasc
index d397b01db34cf58ab965af41c8c9162b6ae6c1ec..a24fa29b319082fa400f04b5fa7a1984c75325c7 100644 (file)
--- a/modules/aaa/NWGNUauthbasc
+++ b/modules/aaa/NWGNUauthbasc
@@ -16,12 +16,10 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/aaa/NWGNUauthdigt b/modules/aaa/NWGNUauthdigt
index f35944aa7ab1bc655c7ec1decdf31adf86be2f3b..1ed1f045270a7d1598353be445ab5f1c9ef1818c 100644 (file)
--- a/modules/aaa/NWGNUauthdigt
+++ b/modules/aaa/NWGNUauthdigt
@@ -16,12 +16,10 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/aaa/NWGNUauthform b/modules/aaa/NWGNUauthform
index 6f052e6319bf42cdcc875a8de4591777b94367a5..a54266d373b0c3ca3ac3ea2e4cc4cca78511cc28 100644 (file)
--- a/modules/aaa/NWGNUauthform
+++ b/modules/aaa/NWGNUauthform
@@ -16,14 +16,12 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
-                       $(AP_WORK)/modules/session \
-                       $(AP_WORK)/modules/filters \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
+                       $(STDMOD)/session \
+                       $(STDMOD)/filters \
                        $(EOLIST)
 
 #

diff --git a/modules/aaa/NWGNUauthnsocache b/modules/aaa/NWGNUauthnsocache
index 2792f495d5c5b3e1f788a7f1ccb7d15c2aaa3726..64e8e5baf6b745316221fc77added42f1ff6b3ee 100644 (file)
--- a/modules/aaa/NWGNUauthnsocache
+++ b/modules/aaa/NWGNUauthnsocache
@@ -20,7 +20,6 @@ XINCDIRS      += \
                        $(APRUTIL)/include \
                        $(AP_WORK)/include \
                        $(NWOS) \
-                       $(AP_WORK)/modules/database \
                        $(EOLIST)
 
 #

diff --git a/modules/aaa/NWGNUauthzdbd b/modules/aaa/NWGNUauthzdbd
index 115fbdb22fecb0c53b69a54a1b87715ab3fd55a1..492f92d1c0cf81975cbcebc3d368969b024d15bc 100644 (file)
--- a/modules/aaa/NWGNUauthzdbd
+++ b/modules/aaa/NWGNUauthzdbd
@@ -20,7 +20,7 @@ XINCDIRS      += \
                        $(APRUTIL)/include \
                        $(AP_WORK)/include \
                        $(NWOS) \
-                       $(AP_WORK)/modules/database \
+                       $(STDMOD)/database \
                        $(EOLIST)
 
 #

diff --git a/modules/aaa/NWGNUauthzusr b/modules/aaa/NWGNUauthzusr
index 6774c4845bcda3d3283f475938792c0c3a5996bb..2eab6f04a5f72057b4276539395298af86732238 100644 (file)
--- a/modules/aaa/NWGNUauthzusr
+++ b/modules/aaa/NWGNUauthzusr
@@ -16,12 +16,10 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(AP_WORK)/include \
-                       $(NWOS) \
-                       $(AP_WORK)/modules/arch/netware \
                        $(APR)/include \
                        $(APRUTIL)/include \
-                       $(APR) \
+                       $(AP_WORK)/include \
+                       $(NWOS) \
                        $(EOLIST)
 
 #

diff --git a/modules/ssl/NWGNUmakefile b/modules/ssl/NWGNUmakefile
index a63b6e48bf57eeeb05b9b53e10a5ef01c4e4ed43..1dbe9e7e88bb9d28289c8da906de11585c2f80cb 100644 (file)
--- a/modules/ssl/NWGNUmakefile
+++ b/modules/ssl/NWGNUmakefile
@@ -140,7 +140,7 @@ NLM_NAME    = mod_ssl
 ifeq "$(USE_NTLS)" "1"
 NLM_DESCRIPTION        = Apache $(VERSION_STR) SSL module (NTLS)
 else
-NLM_DESCRIPTION        = Apache $(VERSION_STR) SSL module
+NLM_DESCRIPTION        = Apache $(VERSION_STR) SSL module (OpenSSL)
 endif
 
 #

diff --git a/support/NWGNUhtcacheclean b/support/NWGNUhtcacheclean
index aa9e6ea852b9d636ce5a90bcbd3886d0a0af0772..935923a7337b1eeff3caa270cec0fb1e1848005d 100644 (file)
--- a/support/NWGNUhtcacheclean
+++ b/support/NWGNUhtcacheclean
@@ -16,10 +16,12 @@ endif
 # INCDIRS
 #
 XINCDIRS       += \
-                       $(NWOS) \
+                       $(STDMOD)/cache \
                        $(APR)/include \
                        $(APRUTIL)/include \
+                       $(AP_WORK)/include \
                        $(APR)/misc/netware \
+                       $(NWOS) \
                        $(EOLIST)
 
 #
@@ -55,7 +57,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "noopt"
@@ -69,7 +71,7 @@ XDEFINES      += \
                        $(EOLIST)
 
 XLFLAGS                += \
-                       $(EOLIST)
+                       $(EOLIST)
 endif
 
 ifeq "$(RELEASE)" "release"
@@ -91,7 +93,7 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME               = htcacheclean
+NLM_NAME       = htcacheclean
 
 #
 # This is used by the link '-desc ' directive. 
@@ -115,7 +117,7 @@ NLM_SCREEN_NAME = DEFAULT
 # If this is specified, it will override VERSION value in 
 # $(AP_WORK)\build\NWGNUenvironment.inc
 #
-NLM_VERSION            =
+NLM_VERSION    =
 
 #
 # If this is specified, it will override the default of 64K
@@ -141,14 +143,14 @@ NLM_CHECK_SYM     =
 #
 # If these are specified it will be used by the link '-flags' directive
 #
-NLM_FLAGS              =  AUTOUNLOAD, PSEUDOPREEMPTION
+NLM_FLAGS      = AUTOUNLOAD, PSEUDOPREEMPTION
 
 #
 # If this is specified it will be linked in with the XDCData option in the def 
 # file instead of the default of $(NWOS)/apache.xdc.  XDCData can be disabled
 # by setting APACHE_UNIPROC in the environment
 #
-XDCDATA         = 
+XDCDATA                = 
 
 #
 # If there is an NLM target, put it here
@@ -176,7 +178,7 @@ FILES_nlm_objs = \
 # These will be added as a library command in the link.opt file.
 #
 FILES_nlm_libs = \
-       libcpre.o \
+       libcpre.o \
        $(EOLIST)
 
 #
@@ -216,13 +218,13 @@ FILES_nlm_Ximports = \
 #
 FILES_nlm_exports = \
        $(EOLIST)
-       
+
 #   
 # These are the OBJ files needed to create the LIB target above.
 # Paths must all use the '/' character
 #
 FILES_lib_objs = \
-               $(EOLIST)
+       $(EOLIST)
 
 #
 # implement targets and dependancies (leave this section alone)