From: Jean-Marc Lasgouttes Date: Tue, 22 Aug 2006 15:43:48 +0000 (+0000) Subject: Make sure to link lyx and tex2lyx against libiconv. X-Git-Tag: 1.6.10~12713 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=c46e1bdc9a4a9f8809f2024bd76cc54ccb509e6b;p=lyx.git Make sure to link lyx and tex2lyx against libiconv. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14814 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/src/Makefile.am b/src/Makefile.am index 597b7ab39f..4364e25118 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,7 +27,7 @@ LYX_POST_LIBS = frontends/controllers/libcontrollers.la \ BOOST_LIBS = $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_FILESYSTEM) $(BOOST_IOSTREAMS) -OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(AIKSAURUS_LIBS) @LIBS@ $(SOCKET_LIBS) +OTHERLIBS = $(BOOST_LIBS) $(LIBICONV) $(INTLLIBS) $(AIKSAURUS_LIBS) @LIBS@ $(SOCKET_LIBS) bin_PROGRAMS = lyx noinst_PROGRAMS = $(FRONTENDS_PROGS) diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am index 2a0935ac77..37174b69c4 100644 --- a/src/tex2lyx/Makefile.am +++ b/src/tex2lyx/Makefile.am @@ -57,7 +57,7 @@ tex2lyx_SOURCES = \ tex2lyx_LDADD = \ $(top_builddir)/src/support/libsupport.la \ - $(BOOST_LIBS) $(COMPRESSIONLIB) + $(BOOST_LIBS) $(LIBICONV) $(COMPRESSIONLIB) $(LINKED_FILES) : @rm -f $@ ; \