From: Bradley Nicholes <bnicholes@apache.org>
Date: Tue, 7 May 2002 17:42:28 +0000 (+0000)
Subject: Fixed how the NetWare import and exports lists are accessed by the make files.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ca12648e82f94987f2934738ead60072f5a8ae6d;p=apache

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 f642580849..4e4c9fc022 100644
--- 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 2c4c88f808..40986ca9fc 100644
--- 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 8ae4633fe1..04878795af 100644
--- 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 810c956d84..1c1ff45871 100644
--- 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)