Another (IMHO false) fall-through warning silenced

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

diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am
index d5ce4cb3f3b1762904074bb1030eb11e48fa7e0a..7a744abc0b7de57a28ad829ed58aee16eba4562f 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)
+       $(BOOST_INCLUDES) $(ICONV_INCLUDES) $(ZLIB_INCLUDES)
 
 TEST_FILES = \
        test/runtests.cmake \
@@ -36,6 +36,7 @@ TEST_FILES = \
        test/test-insets-basic.tex \
        test/test.ltx \
        test/test-memoir.tex \
+       test/test-minted.tex \
        test/test-modules.tex \
        test/test-refstyle-theorems.tex \
        test/test-scr.tex \
@@ -57,6 +58,7 @@ TEST_RESULTS = \
        test/test-insets-basic.lyx.lyx \
        test/test.lyx.lyx \
        test/test-memoir.lyx.lyx \
+       test/test-minted.lyx.lyx \
        test/test-modules.lyx.lyx \
        test/test-refstyle-theorems.lyx.lyx \
        test/test-scr.lyx.lyx \
@@ -81,32 +83,32 @@ alltests-recursive: tex2lyx
 updatetests: tex2lyx
        $(PYTHON) "$(srcdir)/test/runtests.py" ./tex2lyx "$(top_srcdir)/lib/scripts" "$(srcdir)/test"
 
-LINKED_FILES = \
-       ../Author.cpp \
-       ../Color.cpp \
-       ../Counters.cpp \
-       ../Encoding.cpp \
-       ../FloatList.cpp \
-       ../Floating.cpp \
-       ../FontInfo.cpp \
-       ../graphics/GraphicsParams.cpp \
-       ../insets/ExternalTemplate.cpp \
-       ../insets/ExternalTransforms.cpp \
-       ../insets/InsetLayout.cpp \
-       ../LaTeXPackages.cpp \
-       ../Layout.cpp \
-       ../LayoutFile.cpp \
-       ../LayoutModuleList.cpp \
-       ../Length.cpp \
-       ../lengthcommon.cpp \
-       ../Lexer.cpp \
-       ../ModuleList.cpp \
-       ../Spacing.cpp \
-       ../TextClass.cpp \
-       ../version.cpp
+LYX_OBJS = \
+       ../Author.o \
+       ../CiteEnginesList.o \
+       ../Color.o \
+       ../Counters.o \
+       ../Encoding.o \
+       ../FloatList.o \
+       ../Floating.o \
+       ../FontInfo.o \
+       ../graphics/GraphicsParams.o \
+       ../insets/ExternalTemplate.o \
+       ../insets/ExternalTransforms.o \
+       ../insets/InsetLayout.o \
+       ../LaTeXPackages.o \
+       ../Layout.o \
+       ../LayoutFile.o \
+       ../LayoutModuleList.o \
+       ../Length.o \
+       ../lengthcommon.o \
+       ../Lexer.o \
+       ../ModuleList.o \
+       ../Spacing.o \
+       ../TextClass.o \
+       ../version.o
 
 tex2lyx_SOURCES = \
-       $(LINKED_FILES) \
        boost.cpp \
        Context.cpp \
        Context.h \
@@ -122,13 +124,16 @@ tex2lyx_SOURCES = \
        text.cpp
 
 tex2lyx_LDADD = \
+       $(LYX_OBJS) \
        $(top_builddir)/src/support/liblyxsupport.a \
        $(LIBICONV) $(BOOST_LIBS) \
        $(QT_LIB) $(QT_LDFLAGS) \
-       @LIBS@ $(LIBSHLWAPI) $(LIBPSAPI)
+       @LIBS@ $(ICONV_LIBS) $(ZLIB_LIBS) $(LIBSHLWAPI) $(LIBPSAPI)
 
 if INSTALL_MACOSX
-tex2lyx_LDFLAGS = -framework AppKit
+tex2lyx_LDFLAGS = -framework AppKit \
+       -Wl,-rpath,@loader_path/../Frameworks \
+       -Wl,-rpath,@executable_path/../Frameworks
 endif
 
 .PHONY: alltests alltests-recursive updatetests