---------------------
PatchSet 2005 
Date: 2001/04/20 10:49:13
Author: rbcollins
Branch: squid-amake
Tag: (none) 
Log:
remove obsolete targets, general cleanup

Members: 
	src/Makefile.am:1.1.2.25->1.1.2.26 

Index: squid/src/Makefile.am
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Makefile.am,v
retrieving revision 1.1.2.25
retrieving revision 1.1.2.26
diff -u -r1.1.2.25 -r1.1.2.26
--- squid/src/Makefile.am	20 Apr 2001 01:08:22 -0000	1.1.2.25
+++ squid/src/Makefile.am	20 Apr 2001 10:49:13 -0000	1.1.2.26
@@ -111,22 +111,10 @@
 
 DEFS =  -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
 
-XTRA_LIBS	= @XTRA_LIBS@
-## XTRA_OBJS 	= @XTRA_OBJS@
-STORE_OBJS	= @STORE_OBJS@
-##STORE_MODULES	= @STORE_MODULES@
-REPL_OBJS	= @REPL_OBJS@
-REPL_POLICIES	= @REPL_POLICIES@
-
-##INCLUDES	= -I. -I$(top_builddir)/include -I$(top_srcdir)/include
-
 $(OBJS): $(top_srcdir)/include/version.h ../include/autoconf.h
 
 snmp_core.o snmp_agent.o: ../snmplib/libsnmp.a $(top_srcdir)/include/cache_snmp.h
 
-##globals.o: globals.c Makefile
-##	$(CC) -c globals.c $(CFLAGS) -I$(srcdir) $(DEFAULTS)
-
 globals.c: globals.h mk-globals-c.pl
 	$(PERL) $(srcdir)/mk-globals-c.pl < $(srcdir)/globals.h > $@
 
@@ -181,53 +169,6 @@
 auth_modules.c: auth_modules.sh
 	@$(SHELL) $(srcdir)/auth_modules.sh $(AUTH_MODULES) >auth_modules.c
 
-
-# Michael Lupp <mike@nemesis.saar.de> wants to know about additions
-# to the install target.
-old-install: all install-mkdirs
-	@for dir in $(SUBDIRS); do \
-		echo "Making $@ in $$dir..."; \
-		(cd $$dir ; $(MAKE) $(MFLAGS) prefix="$(prefix)" $@) || exit 1; \
-	done
-	@for f in $(PROGS); do \
-		if test -f $(bindir)/$$f; then \
-			echo $(MV) $(bindir)/$$f $(bindir)/-$$f; \
-			$(MV) $(bindir)/$$f $(bindir)/-$$f; \
-		fi; \
-		echo $(INSTALL_BIN) $$f $(bindir); \
-		$(INSTALL_BIN) $$f $(bindir); \
-		if test -f $(bindir)/-$$f; then \
-			echo $(RM) -f $(bindir)/-$$f; \
-			$(RM) -f $(bindir)/-$$f; \
-		fi; \
-	done
-	@if test -n "$(UTILS)"; then \
-	    for f in $(UTILS); do \
-		if test -f $(libexecdir)/$$f; then \
-			echo $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \
-			$(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \
-		fi; \
-		echo $(INSTALL_BIN) $$f $(libexecdir); \
-		$(INSTALL_BIN) $$f $(libexecdir); \
-		if test -f $(libexecdir)/-$$f; then \
-			echo $(RM) -f $(libexecdir)/-$$f; \
-			$(RM) -f $(libexecdir)/-$$f; \
-		fi; \
-	    done; \
-	fi
-	@for f in $(CGIPROGS); do \
-		if test -f $(libexecdir)/$$f; then \
-			echo $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \
-			$(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \
-		fi; \
-		echo $(INSTALL_BIN) $$f $(libexecdir); \
-		$(INSTALL_BIN) $$f $(libexecdir); \
-		if test -f $(libexecdir)/-$$f; then \
-			echo $(RM) -f $(libexecdir)/-$$f; \
-			$(RM) -f $(libexecdir)/-$$f; \
-		fi; \
-	done
-
 install-data-local:
 	@if test -f $(sysconfdir)/mime.conf ; then \
 	        echo "$@ will not overwrite existing $(sysconfdir)/mime.conf" ; \
@@ -242,16 +183,16 @@
 	        $(INSTALL_DATA) squid.conf.default $(sysconfdir)/squid.conf; \
 	fi
 
-install-pinger:
-	@f=$(PINGER_EXE); \
-	if test -f $(libexecdir)/$$f; then \
-		echo $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \
-		$(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \
-	fi; \
-	echo $(INSTALL_SUID) $$f $(libexecdir); \
-	$(INSTALL_SUID) $$f $(libexecdir) || exit 1; \
-	if test -f $(libexecdir)/-$$f; then \
-		echo $(RM) -f $(libexecdir)/-$$f; \
-		$(RM) -f $(libexecdir)/-$$f; \
-	fi
+##install-pinger:
+##	@f=$(PINGER_EXE); \
+##	if test -f $(libexecdir)/$$f; then \
+##		echo $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \
+##		$(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \
+##	fi; \
+##	echo $(INSTALL_SUID) $$f $(libexecdir); \
+##	$(INSTALL_SUID) $$f $(libexecdir) || exit 1; \
+##	if test -f $(libexecdir)/-$$f; then \
+##		echo $(RM) -f $(libexecdir)/-$$f; \
+##		$(RM) -f $(libexecdir)/-$$f; \
+##	fi