From: Amos Jeffries <amosjeffries@squid-cache.org>
Date: Fri, 1 Oct 2010 15:10:14 +0000 (-0600)
Subject: Make auto-tools portability linked objects part of libcompat
X-Git-Tag: take1~216
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a098f9565ce1d3a34d82644669656a75aa0ee2f1;p=thirdparty%2Fsquid.git

Make auto-tools portability linked objects part of libcompat

This removes the need for many binaries to include libmisc at all.
---

diff --git a/compat/Makefile.am b/compat/Makefile.am
index 5e244ca49e..8181370f4c 100644
--- a/compat/Makefile.am
+++ b/compat/Makefile.am
@@ -25,6 +25,7 @@ libcompat_la_SOURCES = \
 	inet_pton.h \
 	initgroups.h \
 	osdetect.h \
+	psignal.h \
 	stdvarargs.h \
 	strsep.h \
 	strtoll.h \
@@ -56,6 +57,8 @@ libcompat_la_SOURCES = \
 	GnuRegex.h \
 	GnuRegex.c
 
+libcompat_la_LIBADD= $(LIBOBJS)
+
 check_PROGRAMS += testPreCompiler
 TESTS += testPreCompiler
 
diff --git a/lib/drand48.c b/compat/drand48.c
similarity index 100%
rename from lib/drand48.c
rename to compat/drand48.c
diff --git a/lib/eui64_aton.c b/compat/eui64_aton.c
similarity index 100%
rename from lib/eui64_aton.c
rename to compat/eui64_aton.c
diff --git a/lib/getaddrinfo.c b/compat/getaddrinfo.c
similarity index 100%
rename from lib/getaddrinfo.c
rename to compat/getaddrinfo.c
diff --git a/lib/getnameinfo.c b/compat/getnameinfo.c
similarity index 100%
rename from lib/getnameinfo.c
rename to compat/getnameinfo.c
diff --git a/lib/inet_ntop.c b/compat/inet_ntop.c
similarity index 100%
rename from lib/inet_ntop.c
rename to compat/inet_ntop.c
diff --git a/lib/inet_pton.c b/compat/inet_pton.c
similarity index 100%
rename from lib/inet_pton.c
rename to compat/inet_pton.c
diff --git a/lib/initgroups.c b/compat/initgroups.c
similarity index 100%
rename from lib/initgroups.c
rename to compat/initgroups.c
diff --git a/lib/psignal.c b/compat/psignal.c
similarity index 100%
rename from lib/psignal.c
rename to compat/psignal.c
diff --git a/include/psignal.h b/compat/psignal.h
similarity index 100%
rename from include/psignal.h
rename to compat/psignal.h
diff --git a/lib/strerror.c b/compat/strerror.c
similarity index 100%
rename from lib/strerror.c
rename to compat/strerror.c
diff --git a/lib/strsep.c b/compat/strsep.c
similarity index 100%
rename from lib/strsep.c
rename to compat/strsep.c
diff --git a/lib/strtoll.c b/compat/strtoll.c
similarity index 100%
rename from lib/strtoll.c
rename to compat/strtoll.c
diff --git a/lib/tempnam.c b/compat/tempnam.c
similarity index 100%
rename from lib/tempnam.c
rename to compat/tempnam.c
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 8427107fb4..1feae7b30c 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -74,15 +74,11 @@ libmiscutil_a_SOURCES = \
 	xusleep.c \
 	$(XPROF_STATS_SOURCE) \
 	$(WIN32SRC)
-libmiscutil_a_LIBADD = $(LIBOBJS)
 
 # $(top_srcdir)/include/version.h should be a dependency
 libsspwin32_a_SOURCES = \
 	base64.c \
 	sspwin32.c
-libsspwin32_a_LIBADD = \
-	$(LIBOBJS)
-
 
 TESTS += tests/testAll