revert recent change to development/FORMAT (don't change history)

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 597b7ab39f2f1a9dd0e2709873d1b2b292afd925..4911718e9676d19346b1e12eab2db563c38df141 100644 (file)
--- 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)
@@ -245,8 +245,6 @@ lyx_SOURCES = \
        output_docbook.h \
        output_latex.C \
        output_latex.h \
-       output_linuxdoc.C \
-       output_linuxdoc.h \
        output_plaintext.C \
        output_plaintext.h \
        paper.h \