--------------------- PatchSet 1576 Date: 2001/02/15 12:41:32 Author: rbcollins Branch: generic_modules Tag: (none) Log: conf_modules.sh to internal_modules.sh for clarity Members: src/Makefile.in:1.7.4.4->1.7.4.5 src/protos.h:1.18.4.4->1.18.4.5 Index: squid/src/Makefile.in =================================================================== RCS file: /cvsroot/squid-sf//squid/src/Attic/Makefile.in,v retrieving revision 1.7.4.4 retrieving revision 1.7.4.5 diff -u -r1.7.4.4 -r1.7.4.5 --- squid/src/Makefile.in 15 Feb 2001 12:25:16 -0000 1.7.4.4 +++ squid/src/Makefile.in 15 Feb 2001 12:41:32 -0000 1.7.4.5 @@ -1,7 +1,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.7.4.4 2001/02/15 12:25:16 rbcollins Exp $ +# $Id: Makefile.in,v 1.7.4.5 2001/02/15 12:41:32 rbcollins Exp $ # # Uncomment and customize the following to suit your needs: # @@ -104,7 +104,7 @@ client_side.o \ comm.o \ comm_select.o \ - conf_modules.o \ + internal_modules.o \ debug.o \ @DELAY_OBJS@ \ disk.o \ @@ -292,11 +292,11 @@ $(AUTH_OBJS): @sh -c "cd `dirname $@` && $(MAKE) $(MFLAGS) `basename $@`" -conf_modules.c: conf_modules.sh Makefile - sh $(srcdir)/conf_modules.sh $(CONF_MODULES) $(AUTH_MODULES) $(REPL_POLICIES) $(STORE_MODULES) >conf_modules.c +internal_modules.c: internal_modules.sh Makefile + sh $(srcdir)/internal_modules.sh $(CONF_MODULES) $(AUTH_MODULES) $(REPL_POLICIES) $(STORE_MODULES) >internal_modules.c -conf_modules.o: conf_modules.c - $(CC) -c conf_modules.c $(CFLAGS) -I$(srcdir) +intenral_modules.o: internal_modules.c + $(CC) -c internal_modules.c $(CFLAGS) -I$(srcdir) $(CONF_MODULE_OBJS): @sh -c "cd `dirname $@` && $(MAKE) $(MFLAGS) `basename $@`" @@ -409,7 +409,7 @@ clean: -rm -rf *.o *pure_* core $(PROGS) $(UTILS) $(CGIPROGS) $(SUID_UTILS) -rm -f cf_gen cf_gen_defines.h cf_parser.c cf.data globals.c string_arrays.c - -rm -f store_modules.c conf_modules.c squid.conf + -rm -f internal_modules.c squid.conf @for dir in $(SUBDIRS); do \ echo "Making $@ in $$dir..."; \ (cd $$dir ; $(MAKE) $(MFLAGS) prefix="$(prefix)" $@) || exit 1; \ Index: squid/src/protos.h =================================================================== RCS file: /cvsroot/squid-sf//squid/src/protos.h,v retrieving revision 1.18.4.4 retrieving revision 1.18.4.5 diff -u -r1.18.4.4 -r1.18.4.5 --- squid/src/protos.h 15 Feb 2001 12:25:17 -0000 1.18.4.4 +++ squid/src/protos.h 15 Feb 2001 12:41:32 -0000 1.18.4.5 @@ -1,6 +1,6 @@ /* - * $Id: protos.h,v 1.18.4.4 2001/02/15 12:25:17 rbcollins Exp $ + * $Id: protos.h,v 1.18.4.5 2001/02/15 12:41:32 rbcollins Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -1283,7 +1283,7 @@ */ extern StatCounters *snmpStatGet(int); -/* conf_modules.sh */ +/* internal_modules.sh */ extern int mod_internal_install(const char *, modNode *); /* modules.c */ extern void mod_register(const char * namestr, MOD_INSTALL *, MOD_UNINSTALL *, modNode *);