From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 7 Jan 2009 10:46:03 +0000 (+1300)
Subject: Move IPAddress to libip.la
X-Git-Tag: SQUID_3_2_0_1~1269^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7f125868d9735cf57a8a7c98e57ab3bbf5036357;p=thirdparty%2Fsquid.git

Move IPAddress to libip.la
---

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 87e9d4190e..eefc2d5fbb 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -74,7 +74,6 @@ libmiscutil_a_SOURCES = \
 	hash.c \
 	heap.c \
 	html_quote.c \
-	IPAddress.cc \
 	iso3307.c \
 	md5.c \
 	radix.c \
@@ -130,9 +129,6 @@ CLEANFILES += testHeaders.c
 tests_testAll_SOURCES= \
 	tests/testArray.h \
 	tests/testArray.cc \
-	tests/testIPAddress.h \
-	tests/testIPAddress.cc \
-	IPAddress.cc \
 	tests/testRFC1035.h \
 	tests/testRFC1035.cc \
 	tests/testMain.cc \
diff --git a/lib/IPAddress.cc b/src/ip/IpAddress.cc
similarity index 100%
rename from lib/IPAddress.cc
rename to src/ip/IpAddress.cc
diff --git a/include/IPAddress.h b/src/ip/IpAddress.h
similarity index 100%
rename from include/IPAddress.h
rename to src/ip/IpAddress.h
diff --git a/src/ip/Makefile.am b/src/ip/Makefile.am
index 46fae62f37..2acb99912f 100644
--- a/src/ip/Makefile.am
+++ b/src/ip/Makefile.am
@@ -15,19 +15,18 @@ $(OBJS): $(top_srcdir)/include/version.h $(top_srcdir)/include/autoconf.h
 
 # IP Specific Configurations
 
-#EXTRA_PROGRAMS = \
-#	testIcmp
-
 noinst_LTLIBRARIES = libip.la
 
 libip_la_SOURCES = \
+	IpAddress.h \
+	IpAddress.cc \
 	IpIntercept.h \
 	IpIntercept.cc \
 	QosConfig.h \
 	QosConfig.cc
 
 
-check_PROGRAMS= testHeaders
+check_PROGRAMS= testHeaders testIpAddress
 TESTS= $(check_PROGRAMS)
 
 ## Special Universal .h dependency test script
@@ -39,3 +38,15 @@ testHeaders: $(top_srcdir)/src/ip/*.h
 testHeaders.c:
 	touch testHeaders.c
 CLEANFILES += testHeaders.c
+
+
+testIpAddress_SOURCES= \
+	testIpAddress.cc \
+	testIpAddress.h
+nodist_testIpAddress_SOURCES= \
+	../tests/testMain.cc
+testIpAddress_LDADD= \
+	libip.la \
+	@SQUID_CPPUNIT_LA@ \
+	@SQUID_CPPUNIT_LIBS@
+testIpAddress_LDFLAGS= $(LIBADD_DL)
diff --git a/lib/tests/testIPAddress.cc b/src/ip/testIpAddress.cc
similarity index 100%
rename from lib/tests/testIPAddress.cc
rename to src/ip/testIpAddress.cc
diff --git a/lib/tests/testIPAddress.h b/src/ip/testIpAddress.h
similarity index 100%
rename from lib/tests/testIPAddress.h
rename to src/ip/testIpAddress.h