Merge branch 'master' into biblatex2

[lyx.git] / src / tex2lyx / Makefile.am

diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am
index e29356754f0c6c87c6181bf913d5bf2dec236ff8..a4a5fdc65f87c405de00c5fcabc19a6dbc18a119 100644 (file)
--- a/src/tex2lyx/Makefile.am
+++ b/src/tex2lyx/Makefile.am
@@ -19,7 +19,7 @@ DEFAULT_INCLUDES =
 
 AM_CPPFLAGS += -I$(top_srcdir)/src/tex2lyx \
        -I$(top_srcdir)/src -I$(top_builddir) -I$(top_builddir)/src \
-       $(BOOST_INCLUDES) $(ZLIB_INCLUDES)
+       $(BOOST_INCLUDES) $(ICONV_INCLUDES) $(ZLIB_INCLUDES)
 
 TEST_FILES = \
        test/runtests.cmake \
@@ -83,6 +83,7 @@ updatetests: tex2lyx
 
 LINKED_FILES = \
        ../Author.cpp \
+       ../CiteEnginesList.cpp \
        ../Color.cpp \
        ../Counters.cpp \
        ../Encoding.cpp \
@@ -125,7 +126,7 @@ tex2lyx_LDADD = \
        $(top_builddir)/src/support/liblyxsupport.a \
        $(LIBICONV) $(BOOST_LIBS) \
        $(QT_LIB) $(QT_LDFLAGS) \
-       @LIBS@ $(ZLIB_LIBS) $(LIBSHLWAPI) $(LIBPSAPI)
+       @LIBS@ $(ICONV_LIBS) $(ZLIB_LIBS) $(LIBSHLWAPI) $(LIBPSAPI)
 
 if INSTALL_MACOSX
 tex2lyx_LDFLAGS = -framework AppKit \