From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Sun, 23 Mar 2008 19:14:06 +0000 (-0600)
Subject: Polished after giving ICAP/ its own Makefile.
X-Git-Tag: SQUID_3_1_0_1~49^2~302^2~37
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=e8e3eea8a419552b81fa9046ef993dbbcf8789ca;p=thirdparty%2Fsquid.git

Polished after giving ICAP/ its own Makefile.
Removed eCAP hacks from ICAP.
---

diff --git a/src/ICAP/ICAPModXact.h b/src/ICAP/ICAPModXact.h
index e03053106d..ebb69e1b3a 100644
--- a/src/ICAP/ICAPModXact.h
+++ b/src/ICAP/ICAPModXact.h
@@ -34,10 +34,6 @@
 #ifndef SQUID_ICAPMODXACT_H
 #define SQUID_ICAPMODXACT_H
 
-#if USE_ECAP_AS_ICAP_HACK
-#include "eCAP/Xaction.h"
-#else
-
 #include "BodyPipe.h"
 #include "ICAPXaction.h"
 #include "ICAPInOut.h"
@@ -327,6 +323,4 @@ private:
     CBDATA_CLASS2(ICAPModXactLauncher);
 };
 
-#endif /* USE_ECAP_AS_ICAP_HACK */
-
 #endif /* SQUID_ICAPMOD_XACT_H */
diff --git a/src/ICAP/ICAPServiceRep.h b/src/ICAP/ICAPServiceRep.h
index b98f1ffe96..7def2c59dd 100644
--- a/src/ICAP/ICAPServiceRep.h
+++ b/src/ICAP/ICAPServiceRep.h
@@ -34,10 +34,6 @@
 #ifndef SQUID_ICAPSERVICEREP_H
 #define SQUID_ICAPSERVICEREP_H
 
-#if USE_ECAP_AS_ICAP_HACK
-#include "eCAP/ServiceRep.h"
-#else
-
 #include "cbdata.h"
 #include "ICAPInitiator.h"
 #include "ICAPElements.h"
@@ -178,6 +174,4 @@ private:
     CBDATA_CLASS2(ICAPServiceRep);
 };
 
-#endif /* USE_ECAP_AS_ICAP_HACK */
-
 #endif /* SQUID_ICAPSERVICEREP_H */
diff --git a/src/ICAP/Makefile.am b/src/ICAP/Makefile.am
index 9c0c35fc33..86a3f3a503 100644
--- a/src/ICAP/Makefile.am
+++ b/src/ICAP/Makefile.am
@@ -6,9 +6,9 @@ INCLUDES = \
 	-I$(top_srcdir)/include \
         -I$(top_srcdir)/src
 
-noinst_LTLIBRARIES = libICAP.la
+noinst_LTLIBRARIES = libicap.la
 
-libICAP_la_SOURCES = \
+libicap_la_SOURCES = \
 	ICAPClient.cc \
 	ICAPClient.h \
 	ICAPInitiator.cc \
@@ -21,7 +21,7 @@ libICAP_la_SOURCES = \
 	ICAPElements.cc \
 	ICAPElements.h \
 	ICAPOptions.cc \
-	ICAPOptions.h
+	ICAPOptions.h \
 	ICAPServiceRep.cc \
 	ICAPServiceRep.h \
 	ICAPLauncher.cc \
diff --git a/src/Makefile.am b/src/Makefile.am
index c623783381..e84ffce5e1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -219,8 +219,7 @@ AM_CXXFLAGS = @SQUID_CXXFLAGS@
 
 EXTRA_LIBRARIES = libAIO.a libBlocking.a libDiskDaemon.a libDiskThreads.a
 noinst_LIBRARIES = @DISK_LIBS@
-EXTRA_LTLIBRARIES = adaptation/libadaptation.la ICAP/libICAP.la eCAP/libeCAP.la
-noinst_LTLIBRARIES = libsquid.la libauth.la ${ADAPTATION_LIBS}
+noinst_LTLIBRARIES = libsquid.la libauth.la
 
 INCLUDES        = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/lib/libTrie/include
 INCLUDES	+= @SQUID_CPPUNIT_INC@