Fixed how the NetWare import and exports lists are accessed by the make files.

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

diff --git a/modules/experimental/NWGNUdsk_cach b/modules/experimental/NWGNUdsk_cach
index f642580849f8c07163601578432040cd492c9c95..4e4c9fc022ba009e2cfc7bc22727110e10d08a8c 100644 (file)
--- a/modules/experimental/NWGNUdsk_cach
+++ b/modules/experimental/NWGNUdsk_cach
@@ -30,7 +30,6 @@ XINCDIRS      += \
                        $(AP_WORK)/os/NetWare \
                        $(AP_WORK)/server/mpm/NetWare \
                        $(AP_WORK)/srclib/pcre \
-                       ../main \
                        $(NWOS) \
                        $(EOLIST)
 
@@ -220,12 +219,7 @@ FILES_nlm_Ximports = \
        @libc.imp \
        @$(APR)/aprlib.imp \
        @httpd.imp \
-       generate_name \
-       ap_cache_hex2usec \
-       ap_cache_usec2hex \
-       cache_hook_create_entity \
-       cache_hook_open_entity \
-       cache_hook_remove_url \
+       @mod_cache.imp \
        $(EOLIST)
  
 #   

diff --git a/modules/experimental/NWGNUmakefile b/modules/experimental/NWGNUmakefile
index 2c4c88f808987aab6ebe9fc250c03698658d5803..40986ca9fcc4ff323697b451085a0d487d16bf19 100644 (file)
--- a/modules/experimental/NWGNUmakefile
+++ b/modules/experimental/NWGNUmakefile
@@ -152,7 +152,6 @@ XDCDATA         =
 # If there is an NLM target, put it here
 #
 TARGET_nlm = \
-       $(OBJDIR)/deflate.nlm \
        $(OBJDIR)/example.nlm \
        $(OBJDIR)/mod_cach.nlm \
        $(OBJDIR)/mem_cach.nlm \

diff --git a/modules/experimental/NWGNUmem_cach b/modules/experimental/NWGNUmem_cach
index 8ae4633fe1956e272dba0167245d7f3bb36c4c79..04878795af70a2ca31b929134d6a9195d501cffc 100644 (file)
--- a/modules/experimental/NWGNUmem_cach
+++ b/modules/experimental/NWGNUmem_cach
@@ -179,7 +179,6 @@ TARGET_lib = \
 #
 FILES_nlm_objs = \
        $(OBJDIR)/mod_mem_cache.o \
-       $(OBJDIR)/cache_hash.o \
        $(EOLIST)
 
 #
@@ -221,9 +220,7 @@ FILES_nlm_Ximports = \
        @libc.imp \
        @$(APR)/aprlib.imp \
        @httpd.imp \
-       cache_hook_create_entity \
-       cache_hook_open_entity \
-       cache_hook_remove_url \
+       @mod_cache.imp \
        $(EOLIST)
  
 #   

diff --git a/modules/experimental/NWGNUmod_cach b/modules/experimental/NWGNUmod_cach
index 810c956d844a6b8c6c502555cb7d7a612e98e219..1c1ff45871fda34e282dfc6a31f083e93efe8aa2 100644 (file)
--- a/modules/experimental/NWGNUmod_cach
+++ b/modules/experimental/NWGNUmod_cach
@@ -179,6 +179,7 @@ TARGET_lib = \
 #
 FILES_nlm_objs = \
        $(OBJDIR)/cache_util.o \
+       $(OBJDIR)/cache_hash.o \
        $(OBJDIR)/cache_storage.o \
        $(OBJDIR)/mod_cache.o \
        $(EOLIST)
@@ -230,12 +231,7 @@ FILES_nlm_Ximports = \
 # Any symbols exported to here
 #
 FILES_nlm_exports = \
-       generate_name \
-       ap_cache_hex2usec \
-       ap_cache_usec2hex \
-       cache_hook_create_entity \
-       cache_hook_open_entity \
-       cache_hook_remove_url \
+       @mod_cache.imp \
        cache_module \
        $(EOLIST)