From: Amos Jeffries Date: Sat, 25 Apr 2009 06:27:21 +0000 (-0600) Subject: Correct use of custom target testheaders: X-Git-Tag: SQUID_3_2_0_1~1042 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ee342e0bde15934f195be9b90d3e25c2479b848c;p=thirdparty%2Fsquid.git Correct use of custom target testheaders: - Adds use of .PHONY in all files the do the test - Fixes dist breakage after automake changes --- diff --git a/compat/Makefile.am b/compat/Makefile.am index 4e0eac8ba5..cb18046ea8 100644 --- a/compat/Makefile.am +++ b/compat/Makefile.am @@ -2,22 +2,8 @@ # Makefile for the Squid Portability Library # -# Housekeeping, shared by all Squid Makefiles. -# TODO: make this set by configure? -AM_CFLAGS = @SQUID_CFLAGS@ -AM_CXXFLAGS = @SQUID_CXXFLAGS@ -DEFS = @DEFS@ -CLEANFILES = +include $(top_srcdir)/src/Common.am -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ - -I$(top_builddir)/lib \ - @SQUID_CPPUNIT_INC@ - -$(OBJS): $(top_srcdir)/include/version.h $(top_srcdir)/include/autoconf.h # Ideally this would be 100% inline functions and macro wrappers. @@ -55,16 +41,16 @@ libcompat_la_SOURCES = \ GnuRegex.c -check_PROGRAMS= testHeaders -TESTS= $(check_PROGRAMS) +# os/ subdir prevents us using src/TestHeaders.am +# +TESTS += testHeaders ## Special Universal .h dependency test script ## aborts if error encountered -testHeaders: $(top_srcdir)/compat/*.h $(top_srcdir)/compat/os/*.h - $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "$(top_srcdir)/compat/" || exit 1 - $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "$(top_srcdir)/compat/os/" || exit 1 +testHeaders: $(top_srcdir)/*.h $(top_srcdir)/os/*.h + $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "$(top_srcdir)" || exit 1 + $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "$(top_srcdir)/os" || exit 1 + +CLEANFILES += testHeaders -## No such file... -testHeaders.c: - touch testHeaders.c -CLEANFILES += testHeaders.c +.PHONY: testHeaders diff --git a/lib/Makefile.am b/lib/Makefile.am index ab4274d77e..1b900803e6 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -3,6 +3,8 @@ # $Id$ # +include $(top_srcdir)/src/Common.am + SUBDIRS = if USE_LOADABLE_MODULES @@ -13,14 +15,10 @@ if USE_ESI SUBDIRS += libTrie endif -CLEANFILES = - install: all install-strip: all -AM_CFLAGS = @SQUID_CFLAGS@ -AM_CXXFLAGS = @SQUID_CXXFLAGS@ if ENABLE_XPROF_STATS XPROF_STATS_SOURCE = Profiler.c @@ -103,27 +101,10 @@ libntlmauth_a_LIBADD = \ libsspwin32_a_SOURCES = \ sspwin32.c -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_builddir)/include \ - -I$(top_srcdir)/include \ - @SQUID_CPPUNIT_INC@ -##FIXME - set these in configure.in and reuse -check_PROGRAMS= \ - testHeaders \ - tests/testAll -TESTS=$(check_PROGRAMS) - -## Special Universal .h dependency test script -## aborts if error encountered -testHeaders: $(top_srcdir)/include/*.h - $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "$(top_srcdir)/include" || exit 1 +TESTS += tests/testAll -## No such file... -testHeaders.c: - touch testHeaders.c -CLEANFILES += testHeaders.c +check_PROGRAMS += tests/testAll tests_testAll_SOURCES= \ tests/testArray.h \ @@ -139,3 +120,12 @@ tests_testAll_LDADD= @SQUID_CPPUNIT_LA@ @SQUID_CPPUNIT_LIBS@ tests_testAll_LDFLAGS = $(LIBADD_DL) + +## Special Universal .h dependency test script +## aborts if error encountered +testHeaders: $(top_srcdir)/include/*.h + $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "$(top_srcdir)/include" || exit 1 + +TESTS += testHeaders +CLEANFILES += testHeaders +.PHONY: testHeaders diff --git a/src/Makefile.am b/src/Makefile.am index d2d756f5f5..540385b310 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -831,22 +831,6 @@ check_PROGRAMS+= tests/testAuth \ tests/testURL \ @STORE_TESTS@ -## Special Universal .h dependency test script -## aborts if error encountered -testHeaders: $(top_srcdir)/src/*.h $(top_srcdir)/src/DiskIO/*.h $(top_srcdir)/src/DiskIO/*/*.h - $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "." || exit 1 - $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "DiskIO" || exit 1 - $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "DiskIO/AIO" || exit 1 - $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "DiskIO/Blocking" || exit 1 - $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "DiskIO/DiskDaemon" || exit 1 - $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "DiskIO/DiskThreads" || exit 1 -## src/repl/ has no .h files and its own makefile. - -## No such file... -testHeaders.c: - touch testHeaders.c -CLEANFILES += testHeaders.c - ### Template for new Unit Test Program ## - add tests/testX to check_PROGRAMS above. ## - copy template below and substitue X for class name @@ -2082,3 +2066,21 @@ tests_testURL_LDFLAGS = $(LIBADD_DL) tests_testURL_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \ @REPL_OBJS@ \ @SQUID_CPPUNIT_LA@ + + +TESTS += testHeaders + +## Special Universal .h dependency test script +## aborts if error encountered +testHeaders: $(top_srcdir)/src/*.h $(top_srcdir)/src/DiskIO/*.h $(top_srcdir)/src/DiskIO/*/*.h + $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "." || exit 1 + $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "DiskIO" || exit 1 + $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "DiskIO/AIO" || exit 1 + $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "DiskIO/Blocking" || exit 1 + $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "DiskIO/DiskDaemon" || exit 1 + $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "DiskIO/DiskThreads" || exit 1 +## src/repl/ has no .h files and its own makefile. + +CLEANFILES += testHeaders +.PHONY: testHeaders + diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am index 59a350c3ec..d1ac796877 100644 --- a/src/auth/Makefile.am +++ b/src/auth/Makefile.am @@ -59,7 +59,7 @@ libnegotiate_la_SOURCES = \ negotiate/auth_negotiate.h -check_PROGRAMS += testHeaders +TESTS += testHeaders ## Special Universal .h dependency test script ## aborts if error encountered @@ -70,5 +70,5 @@ testHeaders: $(top_srcdir)/src/auth/*.h $(top_srcdir)/src/auth/basic/*.h $(top_s $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "$(top_srcdir)/src/auth/ntlm" || exit 1 $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "$(top_srcdir)/src/auth/negotiate" || exit 1 -CLEANFILES += testHeaders.c +CLEANFILES += testHeaders .PHONY: testHeaders diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am index 664a866002..5dce8d6130 100644 --- a/src/fs/Makefile.am +++ b/src/fs/Makefile.am @@ -39,7 +39,14 @@ EXTRA_DIST = \ INCLUDES += -I$(srcdir) -check_PROGRAMS += testHeaders +## targets below to emulate distributed makefiles +coss/all: libcoss.la +coss/clean: clean +ufs/all: libufs.la +ufs/clean: clean + + +TESTS += testHeaders ## Special Universal .h dependency test script ## aborts if error encountered @@ -50,13 +57,6 @@ testHeaders: $(top_srcdir)/src/fs/ufs/*.h $(top_srcdir)/src/fs/coss/*.h ## aufs/ has no .h files ## ./ has no .h files -## No such file... -testHeaders.c: - touch testHeaders.c -CLEANFILES += testHeaders.c +CLEANFILES += testHeaders -## targets below to emulate distributed makefiles -coss/all: libcoss.la -coss/clean: clean -ufs/all: libufs.la -ufs/clean: clean +.PHONY: testHeaders diff --git a/src/repl/Makefile.am b/src/repl/Makefile.am index 1799a0663e..a0eef43b82 100644 --- a/src/repl/Makefile.am +++ b/src/repl/Makefile.am @@ -18,8 +18,9 @@ noinst_LIBRARIES = @REPL_LIBS@ liblru_a_SOURCES = lru/store_repl_lru.cc libheap_a_SOURCES = heap/store_heap_replacement.h heap/store_heap_replacement.cc heap/store_repl_heap.cc + ## Until such time as we have a makefile in src/repl/heap etc. -check_PROGRAMS += testHeaders +TESTS += testHeaders ## Special Universal .h dependency test script ## aborts if error encountered