---------------------
PatchSet 992 
Date: 2004/02/28 12:37:36
Author: serassio
Branch: nt
Tag: (none) 
Log:
Some makefile, cleanup fixed some merge problems

Members: 
	helpers/digest_auth/password/Makefile.am:1.1->1.1.2.1 
	snmplib/Makefile.am:1.3.16.2->1.3.16.3 
	src/auth/Makefile.am:1.3.16.2->1.3.16.3 
	src/repl/Makefile.am:1.4.16.2->1.4.16.3 

Index: squid3/helpers/digest_auth/password/Makefile.am
===================================================================
RCS file: /cvsroot/squid-sf//squid3/helpers/digest_auth/password/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- squid3/helpers/digest_auth/password/Makefile.am	14 Oct 2002 00:18:16 -0000	1.1
+++ squid3/helpers/digest_auth/password/Makefile.am	28 Feb 2004 12:37:36 -0000	1.1.2.1
@@ -1,12 +1,16 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.1 2002/10/14 00:18:16 squidadm Exp $
+#  $Id: Makefile.am,v 1.1.2.1 2004/02/28 12:37:36 serassio Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
 
 libexec_PROGRAMS = digest_pw_auth
+digest_pw_auth_SOURCES = digest_pw_auth.c \
+	digest_common.h \
+	text_backend.c \
+	text_backend.h
 INCLUDES      = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \
 		-I$(top_srcdir)/src/
 
Index: squid3/snmplib/Makefile.am
===================================================================
RCS file: /cvsroot/squid-sf//squid3/snmplib/Makefile.am,v
retrieving revision 1.3.16.2
retrieving revision 1.3.16.3
diff -u -r1.3.16.2 -r1.3.16.3
--- squid3/snmplib/Makefile.am	17 Aug 2003 12:39:09 -0000	1.3.16.2
+++ squid3/snmplib/Makefile.am	28 Feb 2004 12:37:37 -0000	1.3.16.3
@@ -11,7 +11,8 @@
 	snmp_msg.c \
 	snmp_pdu.c  snmplib_debug.c
 if ENABLE_MINGW32SPECIFIC
-INCLUDES        = -I$(top_srcdir)/port/win32/include -I$(top_builddir)/include -I$(top_srcdir)/include
+INCLUDES        = -I$(top_srcdir)/port/win32/include \
+		-I$(top_builddir)/include -I$(top_srcdir)/include
 else
 INCLUDES	= -I$(top_builddir)/include -I$(top_srcdir)/include
 endif
Index: squid3/src/auth/Makefile.am
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/auth/Makefile.am,v
retrieving revision 1.3.16.2
retrieving revision 1.3.16.3
diff -u -r1.3.16.2 -r1.3.16.3
--- squid3/src/auth/Makefile.am	15 Mar 2003 09:36:19 -0000	1.3.16.2
+++ squid3/src/auth/Makefile.am	28 Feb 2004 12:37:37 -0000	1.3.16.3
@@ -1,6 +1,6 @@
 #  Makefile for authentication modules in the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.3.16.2 2003/03/15 09:36:19 serassio Exp $
+#  $Id: Makefile.am,v 1.3.16.3 2004/02/28 12:37:37 serassio Exp $
 #
 AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = @SQUID_CFLAGS@
@@ -17,8 +17,8 @@
 libntlm_a_SOURCES	= ntlm/auth_ntlm.cc ntlm/auth_ntlm.h
 
 if ENABLE_WIN32SPECIFIC
-INCLUDES      = -I. -I$(top_srcdir)/port/win32/include -I$(top_srcdir)/include \
-	-I$(top_srcdir)/src
+INCLUDES      = -I. -I$(top_srcdir)/port/win32/include -I$(top_builddir)/include \
+	-I$(top_srcdir)/include -I$(top_srcdir)/src
 else
 INCLUDES      = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \
 	-I$(top_srcdir)/src/
Index: squid3/src/repl/Makefile.am
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/repl/Makefile.am,v
retrieving revision 1.4.16.2
retrieving revision 1.4.16.3
diff -u -r1.4.16.2 -r1.4.16.3
--- squid3/src/repl/Makefile.am	15 Mar 2003 09:36:19 -0000	1.4.16.2
+++ squid3/src/repl/Makefile.am	28 Feb 2004 12:37:37 -0000	1.4.16.3
@@ -1,6 +1,6 @@
 #  Makefile for storage modules in the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.4.16.2 2003/03/15 09:36:19 serassio Exp $
+#  $Id: Makefile.am,v 1.4.16.3 2004/02/28 12:37:37 serassio Exp $
 #
 
 AUTOMAKE_OPTIONS = subdir-objects
@@ -16,7 +16,8 @@
 libheap_a_SOURCES = heap/store_heap_replacement.h heap/store_heap_replacement.cc heap/store_repl_heap.cc
 
 if ENABLE_WIN32SPECIFIC
-INCLUDES      = -I. -I$(top_srcdir)/port/win32/include -I$(top_srcdir)/include -I$(top_srcdir)/src
+INCLUDES      = -I. -I$(top_srcdir)/port/win32/include -I$(top_builddir)/include \
+	-I$(top_srcdir)/include -I$(top_srcdir)/src/
 else
 INCLUDES      = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \
 	-I$(top_srcdir)/src/