Permalink
Browse files

TS-1723: Remove @LIBICONV@ from Makefile.ams

  • Loading branch information...
1 parent 8cbc7c8 commit 8a9ad20522e5993cd3b10e6f30326db0e1e4e47c @igalic igalic committed Feb 25, 2013
Showing with 16 additions and 17 deletions.
  1. +1 −1 cop/Makefile.am
  2. +1 −1 example/app-template/Makefile.am
  3. +6 −6 lib/ts/Makefile.am
  4. +1 −2 mgmt/Makefile.am
  5. +1 −1 mgmt/api/remote/Makefile.am
  6. +2 −2 mgmt/cli/Makefile.am
  7. +4 −4 proxy/Makefile.am
View
@@ -35,5 +35,5 @@ traffic_cop_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
traffic_cop_LDADD = \
$(top_builddir)/mgmt/api/remote/libtsmgmt.la \
$(top_builddir)/lib/ts/libtsutil.la \
- @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBTCL@ @LIBICONV@ @LIBRT@ @LIBDL@ \
+ @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBTCL@ @LIBRT@ @LIBDL@ \
@LIBEXECINFO@ @LIBSSL@ @LIBRESOLV@
@@ -39,7 +39,7 @@ tsapp_LDADD = \
$(top_builddir)/lib/ts/libtsutil.la \
@LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ @LIBRT@ \
@LIBPCRE@ @LIBSSL@ @LIBTCL@ @LIBDL@ \
- @LIBEXPAT@ @LIBDEMANGLE@ @LIBICONV@ \
+ @LIBEXPAT@ @LIBDEMANGLE@ \
@LIBMLD@ @LIBEXC@ -lm @LIBPROFILER@ @LIBEXECINFO@
EXTRA_DIST = records.config.in
View
@@ -25,7 +25,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/lib
lib_LTLIBRARIES = libtsutil.la
libtsutil_la_LDFLAGS = -no-undefined -version-info @TS_LIBTOOL_VERSION@
-libtsutil_la_LIBADD = @LIBOBJS@ @LIBPCRE@ @LIBSSL@ @LIBTCL@ @LIBRESOLV@ @LIBRT@ @LIBICONV@ @LIBSOCKET@ @LIBNSL@ @LIBCAP@ @LIBHWLOC@ -lc
+libtsutil_la_LIBADD = @LIBOBJS@ @LIBPCRE@ @LIBSSL@ @LIBTCL@ @LIBRESOLV@ @LIBRT@ @LIBSOCKET@ @LIBNSL@ @LIBCAP@ @LIBHWLOC@ -lc
libtsutil_la_SOURCES = \
Allocator.h \
@@ -161,24 +161,24 @@ ParseRulesCType: CompileParseRules
mkdfa_SOURCES = mkdfa.c
test_atomic_SOURCES = test_atomic.cc
-test_atomic_LDADD = libtsutil.la @LIBTHREAD@ @LIBTCL@ @LIBICONV@ @LIBEXECINFO@ @LIBPCRE@
+test_atomic_LDADD = libtsutil.la @LIBTHREAD@ @LIBTCL@ @LIBEXECINFO@ @LIBPCRE@
test_atomic_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
test_freelist_SOURCES = test_freelist.cc
-test_freelist_LDADD = libtsutil.la @LIBTHREAD@ @LIBTCL@ @LIBICONV@ @LIBEXECINFO@ @LIBPCRE@
+test_freelist_LDADD = libtsutil.la @LIBTHREAD@ @LIBTCL@ @LIBEXECINFO@ @LIBPCRE@
test_freelist_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
test_arena_SOURCES = test_arena.cc
-test_arena_LDADD = libtsutil.la @LIBTHREAD@ @LIBTCL@ @LIBICONV@ @LIBEXECINFO@ @LIBPCRE@
+test_arena_LDADD = libtsutil.la @LIBTHREAD@ @LIBTCL@ @LIBEXECINFO@ @LIBPCRE@
test_arena_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
test_List_SOURCES = test_List.cc
test_Map_SOURCES = test_Map.cc
-test_Map_LDADD = libtsutil.la @LIBTHREAD@ @LIBTCL@ @LIBICONV@ @LIBEXECINFO@ @LIBPCRE@
+test_Map_LDADD = libtsutil.la @LIBTHREAD@ @LIBTCL@ @LIBEXECINFO@ @LIBPCRE@
test_Map_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
test_Vec_SOURCES = test_Vec.cc
-test_Vec_LDADD = libtsutil.la @LIBTHREAD@ @LIBTCL@ @LIBICONV@ @LIBEXECINFO@ @LIBPCRE@
+test_Vec_LDADD = libtsutil.la @LIBTHREAD@ @LIBTCL@ @LIBEXECINFO@ @LIBPCRE@
test_Vec_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
CompileParseRules_SOURCES = CompileParseRules.cc
View
@@ -102,8 +102,7 @@ traffic_manager_LDADD = \
$(top_builddir)/mgmt/tools/libinksysapi.a \
$(top_builddir)/mgmt/tools/libinkconfigapi.a \
$(top_builddir)/lib/ts/libtsutil.la \
- @LIBEXPAT@ @LIBPCRE@ \
- @LIBTCL@ @LIBICONV@ \
+ @LIBEXPAT@ @LIBPCRE@ @LIBTCL@ \
-lm @LIBDL@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ \
@LIBTHREAD@ @LIBRT@ @LIBEXECINFO@ @LIBCAP@
@@ -57,4 +57,4 @@ traffic_api_cli_remote_LDADD = \
libtsmgmt.la \
$(top_builddir)/lib/ts/libtsutil.la \
@LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ \
- @LIBTCL@ @LIBRT@ @LIBDL@ @LIBSSL@ @LIBICONV@ @LIBEXECINFO@
+ @LIBTCL@ @LIBRT@ @LIBDL@ @LIBSSL@ @LIBEXECINFO@
View
@@ -80,13 +80,13 @@ traffic_shell_LDADD = \
$(top_builddir)/mgmt/utils/libutils_lm.a \
$(top_builddir)/lib/ts/libtsutil.la \
$(LIBTCL) $(LIBREADLINE) \
- @LIBDL@ -lm @LIBICONV@ @LIBEXPAT@ @LIBSSL@ \
+ @LIBDL@ -lm @LIBEXPAT@ @LIBSSL@ \
@LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ \
@LIBRT@ @LIBEXECINFO@ @LIBPCRE@ @LIBREADLINE@
traffic_line_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
traffic_line_LDADD = \
$(top_builddir)/mgmt/api/remote/libtsmgmt.la \
$(top_builddir)/lib/ts/libtsutil.la \
- @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBTCL@ @LIBICONV@ @LIBRT@ @LIBDL@ \
+ @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBTCL@ @LIBRT@ @LIBDL@ \
@LIBEXECINFO@ @LIBSSL@ @LIBRESOLV@
View
@@ -162,7 +162,7 @@ traffic_server_LDADD = \
$(which_libts) \
@LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ @LIBRT@ \
@LIBPCRE@ @LIBSSL@ @LIBTCL@ @LIBDL@ \
- @LIBEXPAT@ @LIBDEMANGLE@ @LIBICONV@ @LIBCAP@ @LIBHWLOC@ \
+ @LIBEXPAT@ @LIBDEMANGLE@ @LIBCAP@ @LIBHWLOC@ \
@LIBZ@ @LIBLZMA@ \
@LIBMLD@ @LIBEXC@ -lm @LIBPROFILER@ @LIBEXECINFO@
@@ -185,7 +185,7 @@ traffic_logcat_LDADD = \
$(top_builddir)/lib/ts/libtsutil.la \
@LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ @LIBRT@ \
@LIBPCRE@ @LIBSSL@ @LIBTCL@ @LIBDL@ \
- @LIBEXPAT@ @LIBDEMANGLE@ @LIBMLD@ @LIBEXC@ @LIBICONV@ -lm @LIBPROFILER@ \
+ @LIBEXPAT@ @LIBDEMANGLE@ @LIBMLD@ @LIBEXC@ -lm @LIBPROFILER@ \
@LIBEXECINFO@
traffic_logstats_SOURCES = logstats.cc
@@ -203,7 +203,7 @@ traffic_logstats_LDADD = \
$(top_builddir)/lib/ts/libtsutil.la \
@LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ @LIBRT@ \
@LIBPCRE@ @LIBSSL@ @LIBTCL@ @LIBDL@ \
- @LIBEXPAT@ @LIBDEMANGLE@ @LIBMLD@ @LIBEXC@ @LIBICONV@ -lm @LIBPROFILER@ \
+ @LIBEXPAT@ @LIBDEMANGLE@ @LIBMLD@ @LIBEXC@ -lm @LIBPROFILER@ \
@LIBEXECINFO@
traffic_sac_SOURCES = sac.cc
@@ -258,7 +258,7 @@ traffic_sac_LDADD = \
$(top_builddir)/lib/ts/libtsutil.la \
@LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ @LIBRT@ \
@LIBPCRE@ @LIBSSL@ @LIBTCL@ @LIBDL@ \
- @LIBEXPAT@ @LIBDEMANGLE@ @LIBMLD@ @LIBEXC@ @LIBICONV@ -lm @LIBPROFILER@ \
+ @LIBEXPAT@ @LIBDEMANGLE@ @LIBMLD@ @LIBEXC@ -lm @LIBPROFILER@ \
@LIBZ@ @LIBLZMA@ @LIBEXECINFO@
if BUILD_TESTS

0 comments on commit 8a9ad20

Please sign in to comment.