---------------------
PatchSet 1577 
Date: 2001/02/15 13:55:30
Author: rbcollins
Branch: generic_modules
Tag: (none) 
Log:
conf_modules.sh to internal_modules.sh for clarity

Members: 
	src/Makefile.in:1.7.4.5->1.7.4.6 
	src/conf_modules.sh:1.1.6.1->1.1.6.2(DEAD) 
	src/internal_modules.sh:1.1->1.1.2.1 

Index: squid/src/Makefile.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Attic/Makefile.in,v
retrieving revision 1.7.4.5
retrieving revision 1.7.4.6
diff -u -r1.7.4.5 -r1.7.4.6
--- squid/src/Makefile.in	15 Feb 2001 12:41:32 -0000	1.7.4.5
+++ squid/src/Makefile.in	15 Feb 2001 13:55:30 -0000	1.7.4.6
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.7.4.5 2001/02/15 12:41:32 rbcollins Exp $
+#  $Id: Makefile.in,v 1.7.4.6 2001/02/15 13:55:30 rbcollins Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -49,8 +49,8 @@
 
 AUTH_OBJS	= @AUTH_OBJS@
 AUTH_MODULES	= @AUTH_MODULES@
-CONF_MODULE_OBJS	= @CONF_MODULE_OBJS@
-CONF_MODULES	= @CONF_MODULES@
+INTERNAL_MODULE_OBJS	= @CONF_MODULE_OBJS@
+INTERNAL_MODULES	= @CONF_MODULES@
 CC		= @CC@
 MAKEDEPEND	= @MAKEDEPEND@
 INSTALL		= @INSTALL@
@@ -104,7 +104,6 @@
 		client_side.o \
 		comm.o \
 		comm_select.o \
-		internal_modules.o \
 		debug.o \
 		@DELAY_OBJS@ \
 		disk.o \
@@ -137,6 +136,7 @@
 		icp_v3.o \
 		ident.o \
 		internal.o \
+		internal_modules.o \
 		ipc.o \
 		ipcache.o \
 		@LEAKFINDER_OBJS@ \
@@ -211,8 +211,8 @@
 
 $(SNMP_OBJS): ../snmplib/libsnmp.a $(top_srcdir)/include/cache_snmp.h
 
-$(SQUID_EXE): $(OBJS) $(STORE_OBJS) $(REPL_OBJS) $(AUTH_OBJS) $(CONF_MODULE_OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(STORE_OBJS) $(REPL_OBJS) $(AUTH_OBJS) $(CONF_MODULE_OBJS) $(SQUID_LIBS)
+$(SQUID_EXE): $(OBJS) $(STORE_OBJS) $(REPL_OBJS) $(AUTH_OBJS) $(INTERNAL_MODULE_OBJS)
+	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(STORE_OBJS) $(REPL_OBJS) $(AUTH_OBJS) $(INTERNAL_MODULE_OBJS) $(SQUID_LIBS)
 
 globals.o: globals.c Makefile
 	$(CC) -c globals.c $(CFLAGS) -I$(srcdir) $(DEFAULTS)
@@ -293,12 +293,12 @@
 	@sh -c "cd `dirname $@` && $(MAKE) $(MFLAGS) `basename $@`"
 
 internal_modules.c: internal_modules.sh Makefile
-	sh $(srcdir)/internal_modules.sh $(CONF_MODULES) $(AUTH_MODULES) $(REPL_POLICIES) $(STORE_MODULES) >internal_modules.c
+	sh $(srcdir)/internal_modules.sh $(INTERNAL_MODULES) $(AUTH_MODULES) $(REPL_POLICIES) $(STORE_MODULES) >internal_modules.c
 
-intenral_modules.o: internal_modules.c
+internal_modules.o: internal_modules.c
 	$(CC) -c internal_modules.c $(CFLAGS) -I$(srcdir)
 
-$(CONF_MODULE_OBJS):
+$(INTERNAL_MODULE_OBJS):
 	@sh -c "cd `dirname $@` && $(MAKE) $(MFLAGS) `basename $@`"
 
 install-mkdirs:
--- squid/src/conf_modules.sh	Wed Feb 14 00:50:28 2007
+++ /dev/null	Wed Feb 14 00:50:05 2007
@@ -1,21 +0,0 @@
-#!/bin/sh
-echo "/* automatically generated by $0 $*"
-echo " * do not edit"
-echo " */"
-echo "#include \"squid.h\""
-echo ""
-for module in "$@"; do
-   echo "extern MOD_INSTALL mod_install_${module};"
-   echo "extern MOD_UNINSTALL mod_uninstall_${module};"
-done
-echo "int mod_internal_install(const char *namestr, modNode *module)"
-echo "{"
-for module in "$@"; do
-   echo "    if (strcasecmp(namestr,\"$module\")==0) {"
-   echo "	mod_register(\"$module\", mod_install_${module}, mod_uninstall_${module}, module);"
-   echo "	return -1;"
-   echo "    } else"
-done
-echo    "       debug(3,0)(\"mod_internal_install: unrecognised module '%s'.\n\",namestr);"
-echo    "    return 0;"
-echo "}"
--- /dev/null	Wed Feb 14 00:50:05 2007
+++ squid/src/internal_modules.sh	Wed Feb 14 00:50:28 2007
@@ -0,0 +1,21 @@
+#!/bin/sh
+echo "/* automatically generated by $0 $*"
+echo " * do not edit"
+echo " */"
+echo "#include \"squid.h\""
+echo ""
+for module in "$@"; do
+   echo "extern MOD_INSTALL mod_install_${module};"
+   echo "extern MOD_UNINSTALL mod_uninstall_${module};"
+done
+echo "int mod_internal_install(const char *namestr, modNode *module)"
+echo "{"
+for module in "$@"; do
+   echo "    if (strcasecmp(namestr,\"$module\")==0) {"
+   echo "	mod_register(\"$module\", mod_install_${module}, mod_uninstall_${module}, module);"
+   echo "	return -1;"
+   echo "    } else"
+done
+echo    "       debug(3,0)(\"mod_internal_install: unrecognised module '%s'.\n\",namestr);"
+echo    "    return 0;"
+echo "}"