Hi all,
out-of-tree Trunk builds are currently broken due to a missing
include-path in src/icmp/Makefile.am, broken paths to libraries to be linked,
and a reference to a nonexisting testHeaders check.
Please apply.
Kinkie
=== modified file 'src/icmp/Makefile.am'
--- src/icmp/Makefile.am 2008-10-17 04:04:11 +0000
+++ src/icmp/Makefile.am 2008-10-18 06:43:40 +0000
@@ -8,7 +8,7 @@
AM_CXXFLAGS = @SQUID_CXXFLAGS@
DEFS = @DEFS@
-INCLUDES = -I$(top_srcdir)/src @SQUID_CPPUNIT_INC@ -I$(top_builddir)/lib
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src @SQUID_CPPUNIT_INC@ -I$(top_builddir)/lib
$(OBJS): $(top_srcdir)/include/version.h $(top_srcdir)/include/autoconf.h
# TODO: get rid of this when config filename is no longer a global constant.
@@ -69,7 +69,7 @@
pinger_LDFLAGS = $(LIBADD_DL)
pinger_LDADD=\
libicmp-core.la \
- libmiscutil.a
+ $(top_builddir)/lib/libmiscutil.a
pinger_DEPENDENCIES= \
libicmp-core.la \
$(top_builddir)/lib/libmiscutil.a
@@ -90,7 +90,7 @@
## fi
-check_PROGRAMS= testIcmp testHeaders
+check_PROGRAMS= testIcmp
TESTS= $(check_PROGRAMS)
## Special Universal .h dependency test script
@@ -109,7 +109,6 @@
Icmp.h \
testIcmp.h \
testIcmp.cc \
- \
../tests/testMain.cc \
../SquidTime.h \
../time.cc \
@@ -120,7 +119,7 @@
@SQUID_CPPUNIT_LIBS@ \
@SQUID_CPPUNIT_LA@ \
libicmp-core.la \
- libmiscutil.a
+ $(top_builddir)/lib/libmiscutil.a
testIcmp_DEPENDENCIES= @SQUID_CPPUNIT_LA@ \
libicmp-core.la \
$(top_builddir)/lib/libmiscutil.a
