---------------------
PatchSet 6907 
Date: 2008/02/21 02:50:33
Author: amosjeffries
Branch: cleanup
Tag: (none) 
Log:
Fix .h dependenciees of fs .cc files.
Tweak test of auth .h files.

Members: 
	src/auth/Makefile.am:1.6.40.3->1.6.40.4 
	src/fs/aufs/StoreFSaufs.cc:1.2->1.2.48.1 
	src/fs/diskd/StoreFSdiskd.cc:1.2->1.2.48.1 
	src/fs/ufs/StoreFSufs.cc:1.2->1.2.48.1 

Index: squid3/src/auth/Makefile.am
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/auth/Makefile.am,v
retrieving revision 1.6.40.3
retrieving revision 1.6.40.4
diff -u -r1.6.40.3 -r1.6.40.4
--- squid3/src/auth/Makefile.am	20 Feb 2008 11:38:44 -0000	1.6.40.3
+++ squid3/src/auth/Makefile.am	21 Feb 2008 02:50:33 -0000	1.6.40.4
@@ -1,6 +1,6 @@
 #  Makefile for authentication modules in the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.6.40.3 2008/02/20 11:38:44 amosjeffries Exp $
+#  $Id: Makefile.am,v 1.6.40.4 2008/02/21 02:50:33 amosjeffries Exp $
 #
 AUTOMAKE_OPTIONS = subdir-objects
 AM_CFLAGS = @SQUID_CFLAGS@
@@ -24,9 +24,9 @@
 
 ## Special Universal .h dependency test script
 ## aborts if error encountered
-testHeaders: *.h basic/*.h digest/*.h ntlm/*.h negotiate/*.h
-	../../test-suite/testheaders.sh "$(CXXCOMPILE)" "." || exit 1
+testHeaders: basic/*.h digest/*.h ntlm/*.h negotiate/*.h
 	../../test-suite/testheaders.sh "$(CXXCOMPILE)" "basic" || exit 1
 	../../test-suite/testheaders.sh "$(CXXCOMPILE)" "digest" || exit 1
 	../../test-suite/testheaders.sh "$(CXXCOMPILE)" "ntlm" || exit 1
 	../../test-suite/testheaders.sh "$(CXXCOMPILE)" "negotiate" || exit 1
+## ./ has no .h files
Index: squid3/src/fs/aufs/StoreFSaufs.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/fs/aufs/StoreFSaufs.cc,v
retrieving revision 1.2
retrieving revision 1.2.48.1
diff -u -r1.2 -r1.2.48.1
--- squid3/src/fs/aufs/StoreFSaufs.cc	21 Dec 2004 03:14:34 -0000	1.2
+++ squid3/src/fs/aufs/StoreFSaufs.cc	21 Feb 2008 02:50:33 -0000	1.2.48.1
@@ -1,6 +1,5 @@
-
 /*
- * $Id: StoreFSaufs.cc,v 1.2 2004/12/21 03:14:34 squidadm Exp $
+ * $Id: StoreFSaufs.cc,v 1.2.48.1 2008/02/21 02:50:33 amosjeffries Exp $
  *
  * DEBUG: section 47    Store Directory Routines
  * AUTHOR: Robert Collins
@@ -34,9 +33,15 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
+#if 0
 #include "squid.h"
 #include "StoreFileSystem.h"
-#include "fs/ufs/StoreFSufs.h"
 #include "DiskIO/DiskIOModule.h"
+#endif
+
+#include "fs/ufs/StoreFSufs.h"
+
+/** \todo FIXME: break UFSSwapDir out so we don't need all the guff */
+#include "fs/ufs/ufscommon.h"
 
 static StoreFSufs<UFSSwapDir> AufsInstance("DiskThreads", "aufs");
Index: squid3/src/fs/diskd/StoreFSdiskd.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/fs/diskd/StoreFSdiskd.cc,v
retrieving revision 1.2
retrieving revision 1.2.48.1
diff -u -r1.2 -r1.2.48.1
--- squid3/src/fs/diskd/StoreFSdiskd.cc	21 Dec 2004 03:14:36 -0000	1.2
+++ squid3/src/fs/diskd/StoreFSdiskd.cc	21 Feb 2008 02:50:33 -0000	1.2.48.1
@@ -1,6 +1,5 @@
-
 /*
- * $Id: StoreFSdiskd.cc,v 1.2 2004/12/21 03:14:36 squidadm Exp $
+ * $Id: StoreFSdiskd.cc,v 1.2.48.1 2008/02/21 02:50:33 amosjeffries Exp $
  *
  * DEBUG: section 47    Store Directory Routines
  * AUTHOR: Robert Collins
@@ -34,9 +33,14 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-
+#if 0
 #include "StoreFileSystem.h"
-#include "fs/ufs/StoreFSufs.h"
 #include "DiskIO/DiskIOModule.h"
+#endif
+
+#include "fs/ufs/StoreFSufs.h"
+
+/** \todo FIXME: break UFSSwapDir out so we don;t need all the extras */
+#include "fs/ufs/ufscommon.h"
 
 static StoreFSufs<UFSSwapDir> DiskdInstance("DiskDaemon", "diskd");
Index: squid3/src/fs/ufs/StoreFSufs.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/fs/ufs/StoreFSufs.cc,v
retrieving revision 1.2
retrieving revision 1.2.48.1
diff -u -r1.2 -r1.2.48.1
--- squid3/src/fs/ufs/StoreFSufs.cc	21 Dec 2004 03:14:36 -0000	1.2
+++ squid3/src/fs/ufs/StoreFSufs.cc	21 Feb 2008 02:50:34 -0000	1.2.48.1
@@ -1,7 +1,5 @@
-
-
 /*
- * $Id: StoreFSufs.cc,v 1.2 2004/12/21 03:14:36 squidadm Exp $
+ * $Id: StoreFSufs.cc,v 1.2.48.1 2008/02/21 02:50:34 amosjeffries Exp $
  *
  * DEBUG: section 47    Store Directory Routines
  * AUTHOR: Robert Collins
@@ -35,10 +33,18 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-
+#if 0
 #include "StoreFileSystem.h"
+#endif
+
 #include "fs/ufs/StoreFSufs.h"
+
+#if 0
 #include "DiskIO/DiskIOModule.h"
+#endif
+
+/** \todo FIXME: break UFSSwapDir out so we don't build all the extras */
+#include "fs/ufs/ufscommon.h"
 
 static StoreFSufs<UFSSwapDir> UfsInstance("Blocking", "ufs");