rename compat lib to libcompat.la since we use full path to link

diff --git a/helpers/basic_auth/LDAP/Makefile.am b/helpers/basic_auth/LDAP/Makefile.am
index 985ba4529abd923528adf62d4630f638f21429f9..a7cd0615268263aff47af3f31d4a4125ea066bbd 100644 (file)
--- a/helpers/basic_auth/LDAP/Makefile.am
+++ b/helpers/basic_auth/LDAP/Makefile.am
@@ -12,7 +12,7 @@ EXTRA_DIST            = squid_ldap_auth.8
 squid_ldap_auth_SOURCES        = squid_ldap_auth.c
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/libsquid-compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil \
        $(LIB_LDAP) \
        $(LIB_LBER) \

diff --git a/helpers/basic_auth/MSNT/Makefile.am b/helpers/basic_auth/MSNT/Makefile.am
index 9ef0046a196601e42210a392f3f6968836d2f228..1e5181134316be1b076be5964b28de9dd9017fe2 100644 (file)
--- a/helpers/basic_auth/MSNT/Makefile.am
+++ b/helpers/basic_auth/MSNT/Makefile.am
@@ -27,7 +27,7 @@ EXTRA_DIST = \
 sysconf_DATA = \
        msntauth.conf.default
 
-LDADD = -L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS) -L$(top_builddir)/libsquid-compat/libsquid-compat.la
+LDADD = -L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS) -L$(top_builddir)/libsquid-compat/libcompat.la
 
 INCLUDES = \
        -I$(top_srcdir) \

diff --git a/helpers/basic_auth/NCSA/Makefile.am b/helpers/basic_auth/NCSA/Makefile.am
index 97adc869f2df77dae68bcd57650c917625e6d8a4..6c22e9bfad2e02fc8882f6a8e85cdddf5993e862 100644 (file)
--- a/helpers/basic_auth/NCSA/Makefile.am
+++ b/helpers/basic_auth/NCSA/Makefile.am
@@ -11,7 +11,7 @@ ncsa_auth_SOURCES     = ncsa_auth.c crypt_md5.c crypt_md5.h
 man_MANS               = ncsa_auth.8
 EXTRA_DIST             = ncsa_auth.8
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/libsquid-compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil \
        $(CRYPTLIB) \
        $(XTRA_LIBS) \

diff --git a/helpers/basic_auth/PAM/Makefile.am b/helpers/basic_auth/PAM/Makefile.am
index 96c5fa2a5302a7d05040ee05dafe5712a80b93cb..6ea2a0a0cc22547bb04fde249df3231093338aa6 100644 (file)
--- a/helpers/basic_auth/PAM/Makefile.am
+++ b/helpers/basic_auth/PAM/Makefile.am
@@ -15,7 +15,7 @@ INCLUDES = \
        -I$(top_srcdir)/include
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/libsquid-compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil \
        -lpam \
        $(XTRA_LIBS)

diff --git a/helpers/basic_auth/SASL/Makefile.am b/helpers/basic_auth/SASL/Makefile.am
index b38d8c663daa8a77cc2d92f8cfd66ef3612090b3..bc7898208c3216a501b46509106f20f5553887d1 100644 (file)
--- a/helpers/basic_auth/SASL/Makefile.am
+++ b/helpers/basic_auth/SASL/Makefile.am
@@ -13,7 +13,7 @@ INCLUDES = \
        -I$(top_srcdir)/include
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/libsquid-compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil \
        $(LIBSASL) \
        $(XTRA_LIBS)

diff --git a/helpers/basic_auth/SMB/Makefile.am b/helpers/basic_auth/SMB/Makefile.am
index 2486197e82a8f9dd749d59ad2f6481b4a641c256..ea3e044a69066ca38b8948af436ce78b1816d07f 100644 (file)
--- a/helpers/basic_auth/SMB/Makefile.am
+++ b/helpers/basic_auth/SMB/Makefile.am
@@ -27,6 +27,6 @@ INCLUDES = \
        -I$(top_srcdir)/include
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/libsquid-compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil \
        $(XTRA_LIBS)

diff --git a/helpers/basic_auth/YP/Makefile.am b/helpers/basic_auth/YP/Makefile.am
index be4e2f89f05fbc90ef8b9ec9044cc4c50c33d21a..ff423ab42d97ced02cbf69498dbc190196dfc833 100644 (file)
--- a/helpers/basic_auth/YP/Makefile.am
+++ b/helpers/basic_auth/YP/Makefile.am
@@ -13,7 +13,7 @@ INCLUDES = \
        -I$(top_srcdir)/include
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/libsquid-compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil \
        $(CRYPTLIB) \
        $(XTRA_LIBS)

diff --git a/helpers/basic_auth/getpwnam/Makefile.am b/helpers/basic_auth/getpwnam/Makefile.am
index 3144d8666601a855b8884ae40b3d221ba5c2fc3f..e5b6293e829ae1d3be2be25e1adfb2d5f1e5954d 100644 (file)
--- a/helpers/basic_auth/getpwnam/Makefile.am
+++ b/helpers/basic_auth/getpwnam/Makefile.am
@@ -17,7 +17,7 @@ INCLUDES = \
        -I$(top_srcdir)/src
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/libsquid-compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil \
        $(CRYPTLIB) \
        $(XTRA_LIBS)

diff --git a/helpers/basic_auth/mswin_sspi/Makefile.am b/helpers/basic_auth/mswin_sspi/Makefile.am
index f636de33ec2359016373d44b2be46e6f5beed2c3..b5a0c72ed20ea0b29947f6664bfa367b0e3d04fc 100644 (file)
--- a/helpers/basic_auth/mswin_sspi/Makefile.am
+++ b/helpers/basic_auth/mswin_sspi/Makefile.am
@@ -12,7 +12,7 @@ libexec_PROGRAMS = mswin_auth
 mswin_auth_SOURCES = mswin_auth.c valid.c valid.h
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/libsquid-compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil \
        -lnetapi32 -ladvapi32 -lsspwin32 \
        $(XTRA_LIBS)

diff --git a/helpers/basic_auth/squid_radius_auth/Makefile.am b/helpers/basic_auth/squid_radius_auth/Makefile.am
index 12fe87963ef05422d410095a77f5a07070035faa..73ba22fc2b2ec0f25f6daf7cb71e59325e4beffc 100644 (file)
--- a/helpers/basic_auth/squid_radius_auth/Makefile.am
+++ b/helpers/basic_auth/squid_radius_auth/Makefile.am
@@ -20,7 +20,7 @@ INCLUDES = \
        -I$(top_srcdir)/include
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/libsquid-compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil \
        $(SSLLIB) \
        $(XTRA_LIBS)

diff --git a/helpers/digest_auth/eDirectory/Makefile.am b/helpers/digest_auth/eDirectory/Makefile.am
index 34540c697a01e5328be3c7711365f89e254f3756..1518e9ddd53491380ca450508626e369703bbd28 100644 (file)
--- a/helpers/digest_auth/eDirectory/Makefile.am
+++ b/helpers/digest_auth/eDirectory/Makefile.am
@@ -21,7 +21,7 @@ INCLUDES = \
        -I$(top_srcdir)/include
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/libsquid-compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil \
        $(LIB_LDAP) \
        $(LIB_LBER) \

diff --git a/helpers/digest_auth/ldap/Makefile.am b/helpers/digest_auth/ldap/Makefile.am
index 8147727964cf40423e74f7bef4f9ec8ac63e1899..78ee12b3149b9202f0f1cb0ff381c782fdf7feee 100644 (file)
--- a/helpers/digest_auth/ldap/Makefile.am
+++ b/helpers/digest_auth/ldap/Makefile.am
@@ -19,7 +19,7 @@ INCLUDES = \
        -I$(top_srcdir)/include
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/libsquid-compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil \
        $(LIB_LDAP) \
        $(LIB_LBER) \

diff --git a/helpers/digest_auth/password/Makefile.am b/helpers/digest_auth/password/Makefile.am
index 359aaaa86ce51876f6025c2be4fc5483b8228891..f2a47aa7a1e0d474c34c5425f11fb1a256b534e7 100644 (file)
--- a/helpers/digest_auth/password/Makefile.am
+++ b/helpers/digest_auth/password/Makefile.am
@@ -19,7 +19,7 @@ INCLUDES = \
        -I$(top_srcdir)/include
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/libsquid-compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil \
        $(CRYPTLIB) \
        $(XTRA_LIBS) \

diff --git a/helpers/external_acl/ip_user/Makefile.am b/helpers/external_acl/ip_user/Makefile.am
index 5b77e91753664c2df89cf3953f001d9eb21febb7..b2fae7871956f454ff52ca963820c8cdc38e4bb9 100644 (file)
--- a/helpers/external_acl/ip_user/Makefile.am
+++ b/helpers/external_acl/ip_user/Makefile.am
@@ -30,6 +30,6 @@ INCLUDES = \
        -I$(top_srcdir)/include
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/libsquid-compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil \
        @XTRA_LIBS@

diff --git a/helpers/external_acl/ldap_group/Makefile.am b/helpers/external_acl/ldap_group/Makefile.am
index 321cd37c42cf63ae991d5abeee495a2d419a480c..ec4c08b295c4d514d775c1f9699c2f5b8201fafb 100644 (file)
--- a/helpers/external_acl/ldap_group/Makefile.am
+++ b/helpers/external_acl/ldap_group/Makefile.am
@@ -18,7 +18,7 @@ INCLUDES = \
        -I$(top_srcdir)/include
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/libsquid-compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil \
        $(LIB_LDAP) \
        $(LIB_LBER) \

diff --git a/helpers/external_acl/mswin_ad_group/Makefile.am b/helpers/external_acl/mswin_ad_group/Makefile.am
index 5136298c749511fdb4e66b3777cafc2876154596..ded06eb385240c40bba855debf48692318f2ae97 100644 (file)
--- a/helpers/external_acl/mswin_ad_group/Makefile.am
+++ b/helpers/external_acl/mswin_ad_group/Makefile.am
@@ -16,7 +16,7 @@ INCLUDES = \
        -I$(top_srcdir)/include
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/libsquid-compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil \
        -lnetapi32 \
        -ladvapi32 \

diff --git a/helpers/external_acl/mswin_lm_group/Makefile.am b/helpers/external_acl/mswin_lm_group/Makefile.am
index a8c08e6dc59ec28522ef604e4e5f6018e21c3d20..9ff52356ef29d221d9ca8dd8334d0f79a275852d 100644 (file)
--- a/helpers/external_acl/mswin_lm_group/Makefile.am
+++ b/helpers/external_acl/mswin_lm_group/Makefile.am
@@ -17,7 +17,7 @@ INCLUDES = \
        -I$(top_srcdir)/include
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/libsquid-compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil \
        -lnetapi32 \
        -ladvapi32 \

diff --git a/helpers/external_acl/session/Makefile.am b/helpers/external_acl/session/Makefile.am
index a2a8963196c55c25922d3e1ee93f1b55203267e5..43acbb366de7d2ab1aa0694734e6e23eed7d00fa 100644 (file)
--- a/helpers/external_acl/session/Makefile.am
+++ b/helpers/external_acl/session/Makefile.am
@@ -18,5 +18,5 @@ INCLUDES = \
        -I$(top_srcdir)/include
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/libsquid-compat/libcompat.la \
        $(LIB_DB)

diff --git a/helpers/external_acl/unix_group/Makefile.am b/helpers/external_acl/unix_group/Makefile.am
index d87720667654c7542a8f6a7f80af4200dcb56173..e0f7dcefea616c66d3922368ea315478bc9de777 100644 (file)
--- a/helpers/external_acl/unix_group/Makefile.am
+++ b/helpers/external_acl/unix_group/Makefile.am
@@ -18,6 +18,6 @@ INCLUDES = \
        -I$(top_srcdir)/include
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/libsquid-compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil \
        @XTRA_LIBS@

diff --git a/helpers/ntlm_auth/fakeauth/Makefile.am b/helpers/ntlm_auth/fakeauth/Makefile.am
index fada603be2f5cfaf8bb508765d3b90bebbab78eb..74b99e9d4d93463431688949a8bba7d02f0a21d3 100644 (file)
--- a/helpers/ntlm_auth/fakeauth/Makefile.am
+++ b/helpers/ntlm_auth/fakeauth/Makefile.am
@@ -16,7 +16,7 @@ INCLUDES = \
        -I$(top_srcdir)/include
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/libsquid-compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil \
        $(CRYPTLIB) \
        $(XTRA_LIBS)

diff --git a/helpers/ntlm_auth/mswin_sspi/Makefile.am b/helpers/ntlm_auth/mswin_sspi/Makefile.am
index af790c60aeb88880827fa82d145b95832f9e5b21..400080c50253a74db968294752b7014d0cc98c18 100644 (file)
--- a/helpers/ntlm_auth/mswin_sspi/Makefile.am
+++ b/helpers/ntlm_auth/mswin_sspi/Makefile.am
@@ -15,7 +15,7 @@ INCLUDES = \
        -I$(top_srcdir)/include
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/libsquid-compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil -lntlmauth \
        -lsspwin32 \
        -lnetapi32 \

diff --git a/helpers/ntlm_auth/smb_lm/Makefile.am b/helpers/ntlm_auth/smb_lm/Makefile.am
index 516ed7ff597d25110831e95aeddd13a7cec50779..70d523d3e51dfb9253d7e3b94ab75c016a5b5dfc 100644 (file)
--- a/helpers/ntlm_auth/smb_lm/Makefile.am
+++ b/helpers/ntlm_auth/smb_lm/Makefile.am
@@ -16,7 +16,7 @@ INCLUDES = \
        -I$(srcdir)/smbval
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/libsquid-compat/libcompat.la \
        -L$(top_builddir)/lib -lntlmauth -lmiscutil \
        smbval/libsmbvalid.a \
        $(CRYPTLIB) \

diff --git a/libsquid-compat/Makefile.am b/libsquid-compat/Makefile.am
index 0366b74c8a2f48c5a8e4bf8d3f46405938872d93..49a4df0ad2853e8b17de433d981a3e805eb35e7a 100644 (file)
--- a/libsquid-compat/Makefile.am
+++ b/libsquid-compat/Makefile.am
@@ -22,9 +22,9 @@ $(OBJS): $(top_srcdir)/include/version.h $(top_srcdir)/include/autoconf.h
 
 # Port Specific Configurations
 
-noinst_LTLIBRARIES = libsquid-compat.la
+noinst_LTLIBRARIES = libcompat.la
 
-libsquid_compat_la_SOURCES = \
+libcompat_la_SOURCES = \
        compat.h \
        osdetect.h \
        compat_shared.h \

diff --git a/src/ip/Makefile.am b/src/ip/Makefile.am
index f1a2ce55b8f56e8d86965e3df40710fb25790d3e..4c478e2811908c19934af45dd99880dfb3595457 100644 (file)
--- a/src/ip/Makefile.am
+++ b/src/ip/Makefile.am
@@ -52,7 +52,7 @@ testIpAddress_SOURCES= \
 nodist_testIpAddress_SOURCES= \
        ../tests/testMain.cc
 testIpAddress_LDADD= \
-       $(top_builddir)/libsquid-compat/libsquid-compat.la \
+       $(top_builddir)/libsquid-compat/libcompat.la \
        libip.la \
        -L$(top_builddir)/lib -lmiscutil \
        @SQUID_CPPUNIT_LA@ \

diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am
index 34c79d5b594e64829a317d4cfb61afba499c7a59..4ad39c60b198a8e2207443794062bb27f0c8e6db 100644 (file)
--- a/test-suite/Makefile.am
+++ b/test-suite/Makefile.am
@@ -17,7 +17,7 @@ INCLUDES = \
        -I$(top_srcdir)/src
 
 LDADD = \
-       -L$(top_builddir)/libsquid-compat/libsquid-compat.la \
+       -L$(top_builddir)/libsquid-compat/libcompat.la \
        -L$(top_builddir)/lib -lmiscutil \
        $(top_builddir)/src/globals.o \
        $(top_builddir)/src/time.o