From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Thu, 19 Feb 2009 20:38:18 +0000 (-0700)
Subject: Use Common.am and TestHeaders.am instead of replicating their code.
X-Git-Tag: SQUID_3_2_0_1~1157^2~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e73c418d368c627031a08b663e64fbdf9aa2f90b;p=thirdparty%2Fsquid.git

Use Common.am and TestHeaders.am instead of replicating their code.
---

diff --git a/src/adaptation/Makefile.am b/src/adaptation/Makefile.am
index dcb27e2b6e..c0cf4fd55f 100644
--- a/src/adaptation/Makefile.am
+++ b/src/adaptation/Makefile.am
@@ -1,12 +1,5 @@
-AM_CFLAGS = @SQUID_CFLAGS@
-AM_CXXFLAGS = @SQUID_CXXFLAGS@
-CLEANFILES =
-
-INCLUDES = \
-	-I$(top_srcdir) \
-	-I$(top_builddir)/include \
-	-I$(top_srcdir)/include \
-        -I$(top_srcdir)/src
+include $(top_srcdir)/src/Common.am
+include $(top_srcdir)/src/TestHeaders.am
 
 noinst_LTLIBRARIES = libadaptation.la
 
@@ -33,13 +26,4 @@ libadaptation_la_SOURCES = \
 	ServiceGroups.cc \
 	ServiceGroups.h
 
-check_PROGRAMS = testHeaders
-
-## test .h correctness
-testHeaders: $(top_srcdir)/src/adaptation/*.h
-	$(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "." || exit 1
 
-## No such file...
-testHeaders.c:
-	touch testHeaders.c
-CLEANFILES += testHeaders.c