From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 2 Apr 2012 02:50:41 +0000 (-0600)
Subject: Maintenance: ensure stub_* files are always bundled
X-Git-Tag: SQUID_3_2_0_17~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3064382045c3c02100892ddd8978512f77502483;p=thirdparty%2Fsquid.git

Maintenance: ensure stub_* files are always bundled

Relying on dependency chains does not always work for stubs.
Builds automake list of files to bundle and add to EXTRA_DIST for
bundling.
---

diff --git a/scripts/source-maintenance.sh b/scripts/source-maintenance.sh
index 30efd9441c..859840ec0e 100755
--- a/scripts/source-maintenance.sh
+++ b/scripts/source-maintenance.sh
@@ -179,6 +179,17 @@ done
 echo " "
 )| sed s%${ROOT}/doc/manuals/%%g | sed s%\.po%\.lang%g >${ROOT}/doc/manuals/language.list
 
+# Build STUB framework include from current stub_* available
+(
+echo -n "STUB_SOURCE= tests/STUB.h"
+for f in `ls -1 ${ROOT}/src/tests/stub_*.cc`
+do
+	echo " \\"
+	echo -n "	${f}"
+done
+echo " "
+)| sed s%${ROOT}/src/%%g >${ROOT}/src/tests/Stub.list
+
 # Run formating
 echo "" >${ROOT}/doc/debug-sections.tmp
 srcformat || exit 1
diff --git a/src/Makefile.am b/src/Makefile.am
index 639882be33..c61389161c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -764,6 +764,8 @@ LDADD = \
 	$(COMPAT_LIB) \
 	$(XTRA_LIBS)
 
+include $(srcdir)/tests/Stub.list
+
 EXTRA_DIST = \
 	cf_gen_defines \
 	cf.data.pre \
@@ -774,7 +776,7 @@ EXTRA_DIST = \
 	mk-string-arrays.pl \
 	mk-string-arrays.awk \
 	repl_modules.sh \
-	tests/STUB.h \
+	$(STUB_SOURCE) \
 	mib.txt \
 	mime.conf.default
 
diff --git a/src/tests/Stub.list b/src/tests/Stub.list
new file mode 100644
index 0000000000..0eb17dc579
--- /dev/null
+++ b/src/tests/Stub.list
@@ -0,0 +1,46 @@
+STUB_SOURCE= tests/STUB.h \
+	tests/stub_CommIO.cc \
+	tests/stub_DelayId.cc \
+	tests/stub_DiskIOModule.cc \
+	tests/stub_HelperChildConfig.cc \
+	tests/stub_HttpReply.cc \
+	tests/stub_HttpRequest.cc \
+	tests/stub_MemObject.cc \
+	tests/stub_MemStore.cc \
+	tests/stub_Port.cc \
+	tests/stub_StatHist.cc \
+	tests/stub_UdsOp.cc \
+	tests/stub_access_log.cc \
+	tests/stub_acl.cc \
+	tests/stub_cache_cf.cc \
+	tests/stub_cache_manager.cc \
+	tests/stub_client_db.cc \
+	tests/stub_client_side_request.cc \
+	tests/stub_comm.cc \
+	tests/stub_debug.cc \
+	tests/stub_errorpage.cc \
+	tests/stub_event.cc \
+	tests/stub_fd.cc \
+	tests/stub_helper.cc \
+	tests/stub_http.cc \
+	tests/stub_icp.cc \
+	tests/stub_internal.cc \
+	tests/stub_ipc.cc \
+	tests/stub_ipc_Forwarder.cc \
+	tests/stub_ipc_TypedMsgHdr.cc \
+	tests/stub_ipcache.cc \
+	tests/stub_libcomm.cc \
+	tests/stub_libicmp.cc \
+	tests/stub_main_cc.cc \
+	tests/stub_mem.cc \
+	tests/stub_mem_node.cc \
+	tests/stub_mime.cc \
+	tests/stub_pconn.cc \
+	tests/stub_stat.cc \
+	tests/stub_stmem.cc \
+	tests/stub_store.cc \
+	tests/stub_store_client.cc \
+	tests/stub_store_rebuild.cc \
+	tests/stub_store_stats.cc \
+	tests/stub_store_swapout.cc \
+	tests/stub_tools.cc