---------------------
PatchSet 2331 
Date: 2001/05/15 00:36:21
Author: rbcollins
Branch: squid-amake
Tag: (none) 
Log:
make distcheck works

Members: 
	Makefile.am:1.1->1.1.2.1 
	configure.in:1.19.4.4->1.19.4.5 
	makefile.am:1.1.2.4->1.1.2.5(DEAD) 
	icons/Makefile.am:1.1.2.3->1.1.2.4 
	src/Makefile.am:1.1.2.27->1.1.2.28 

--- /dev/null	Wed Feb 14 00:52:54 2007
+++ squid/Makefile.am	Wed Feb 14 00:53:18 2007
@@ -0,0 +1,23 @@
+## Process this file with automake to produce Makefile.in
+#
+# $Id$
+#
+
+DIST_SUBDIRS	= lib snmplib scripts src icons errors contrib
+SUBDIRS		= lib @makesnmplib@ scripts src icons errors
+
+EXTRA_DIST = include/config.h.in
+DISTCLEANFILES = include/stamp-h
+
+dist-hook:
+	@ for subdir in "include"; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d $(distdir)/$$subdir \
+	    || mkdir $(distdir)/$$subdir \
+	    || exit 1; \
+	    cp -p $(srcdir)/$$subdir/*.h  $(distdir)/$$subdir \
+	      || exit 1; \
+	  fi; \
+	done
+
+##&&  cp -p $(srcdir)/$$subdir/*.in  $(distdir)/$$subdir
Index: squid/configure.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/configure.in,v
retrieving revision 1.19.4.4
retrieving revision 1.19.4.5
diff -u -r1.19.4.4 -r1.19.4.5
--- squid/configure.in	21 Apr 2001 00:20:19 -0000	1.19.4.4
+++ squid/configure.in	15 May 2001 00:36:21 -0000	1.19.4.5
@@ -3,14 +3,14 @@
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.19.4.4 2001/04/21 00:20:19 rbcollins Exp $
+dnl  $Id: configure.in,v 1.19.4.5 2001/05/15 00:36:21 rbcollins Exp $
 dnl
 dnl
 dnl
 AC_INIT(src/main.c)
 AM_INIT_AUTOMAKE(squid, 2.5-DEVEL)
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.19.4.4 $)dnl
+AC_REVISION($Revision: 1.19.4.5 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 
 dnl AC_CONFIG_AUX_DIR(cfgaux)
@@ -1981,7 +1981,7 @@
 dnl     src/repl/heap/Makefile \
 dnl     src/repl/lru/Makefile \
 AC_OUTPUT([\
-	makefile \
+	Makefile \
 	lib/Makefile \
 	include/config.h \
 	scripts/Makefile \
--- squid/makefile.am	Wed Feb 14 00:53:18 2007
+++ /dev/null	Wed Feb 14 00:52:54 2007
@@ -1,19 +0,0 @@
-## Process this file with automake to produce Makefile.in
-#
-# $Id: makefile.am,v 1.1.2.4 2001/04/07 03:16:25 rbcollins Exp $
-#
-
-DIST_SUBDIRS	= lib snmplib scripts src icons errors contrib
-SUBDIRS		= lib @makesnmplib@ scripts src icons errors
-
-dist-hook:
-	@ for subdir in "include"; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    cp -p $(srcdir)/$$subdir/*.h  $(distdir)/$$subdir \
-	      &&  cp -p $(srcdir)/$$subdir/*.in  $(distdir)/$$subdir \
-	      || exit 1; \
-	  fi; \
-	done
Index: squid/icons/Makefile.am
===================================================================
RCS file: /cvsroot/squid-sf//squid/icons/Makefile.am,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- squid/icons/Makefile.am	8 Apr 2001 22:09:26 -0000	1.1.2.3
+++ squid/icons/Makefile.am	15 May 2001 00:36:21 -0000	1.1.2.4
@@ -32,6 +32,7 @@
 icondir = $(sysconfdir)/icons
 icon_DATA = $(ICON1) $(ICON2)
 EXTRA_DIST = $(ICON1) $(ICON2) icons.shar
+DISTCLEANFILES = $(EXTRA_DIST)
 
 # The magic with ICON1,2 is to have a single dependency
 # for all of the icons.
Index: squid/src/Makefile.am
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Makefile.am,v
retrieving revision 1.1.2.27
retrieving revision 1.1.2.28
diff -u -r1.1.2.27 -r1.1.2.28
--- squid/src/Makefile.am	20 Apr 2001 23:43:29 -0000	1.1.2.27
+++ squid/src/Makefile.am	15 May 2001 00:36:21 -0000	1.1.2.28
@@ -193,6 +193,8 @@
 		$(RM) -f $(sysconfdir)/squid.conf; \
 	fi
 
+DISTCLEANFILES = cf_gen_defines.h cf.data cf_parser.h squid.conf.default \
+	globals.c string_arrays.c repl_modules.c auth_modules.c store_modules.c
 
 ##install-pinger:
 ##	@f=$(PINGER_EXE); \