X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2FMakefile.am;h=87bb3355e0fce42db7b0b1fd641ed86199b8e7f0;hb=b5722962fb0393299e02df0b146522770e98aef6;hp=fe36218a77907ab0b81fcb9f57eb50a24b548972;hpb=41740ea915ee7a95206d780b6256e660cef39c6e;p=lyx.git

diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am
index fe36218a77..87bb3355e0 100644
--- a/src/tex2lyx/Makefile.am
+++ b/src/tex2lyx/Makefile.am
@@ -1,6 +1,7 @@
 include $(top_srcdir)/config/common.am
 
-EXTRA_DIST = TODO.txt tex2lyx.1in $(TEST_FILES) $(TEST_RESULTS) pch.h
+EXTRA_DIST = TODO.txt tex2lyx.1in $(TEST_FILES) $(TEST_RESULTS) \
+	CMakeLists.txt test/CMakeLists.txt
 
 #noinst_LIBRARIES = libtexparser.a
 #
@@ -14,13 +15,15 @@ man_MANS = tex2lyx.1
 
 bin_PROGRAMS = tex2lyx
 
-DEFAULT_INCLUDES =
-
-AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src/tex2lyx \
-	-I$(top_srcdir)/src -I$(top_builddir) $(BOOST_INCLUDES)
+AM_CPPFLAGS += -I$(top_srcdir)/src/tex2lyx \
+	-I$(top_srcdir)/src -I$(top_builddir) -I$(top_builddir)/src \
+	$(BOOST_INCLUDES) $(ICONV_INCLUDES) $(ZLIB_INCLUDES)
 
 TEST_FILES = \
+	test/runtests.cmake \
 	test/runtests.py \
+	test/algo2e.tex \
+	test/beamer.tex \
 	test/box-color-size-space-align.tex \
 	test/CJK.tex \
 	test/CJKutf8.tex \
@@ -28,10 +31,15 @@ TEST_FILES = \
 	test/Dummy~Document.tex \
 	test/foo.eps \
 	test/foo.png \
+	test/listpreamble.tex \
 	test/test-insets.tex \
+	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 \
 	test/test-structure.tex \
 	test/verbatim.tex \
 	test/XeTeX-polyglossia.tex \
@@ -40,15 +48,22 @@ TEST_FILES = \
 	test/xfigtest.pstex_t
 
 TEST_RESULTS = \
+	test/algo2e.lyx.lyx \
+	test/beamer.lyx.lyx \
 	test/box-color-size-space-align.lyx.lyx \
 	test/CJK.lyx.lyx \
 	test/CJKutf8.lyx.lyx \
 	test/DummyDocument.lyx.lyx \
 	test/Dummy~Document.lyx.lyx \
+	test/listpreamble.lyx.lyx \
 	test/test-insets.lyx.lyx \
+	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 \
 	test/test-structure.lyx.lyx \
 	test/verbatim.lyx.lyx \
 	test/XeTeX-polyglossia.lyx.lyx
@@ -56,6 +71,10 @@ TEST_RESULTS = \
 alltests: check alltests-recursive
 
 alltests-recursive: tex2lyx
+	if test "$(srcdir)" = "$(builddir)"; then \
+		echo "tex2lyx tests require a separate build directory"; \
+		exit 1; \
+	fi
 	@$(PYTHON) "$(srcdir)/test/runtests.py"; \
 	if test $$? -eq 0; then \
 		echo -e "=====================\ntex2lyx tests passed.\n====================="; \
@@ -66,34 +85,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
-
-BUILT_SOURCES = $(PCH_FILE)
+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 \
@@ -109,13 +126,17 @@ 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 \
+	-Wl,-headerpad_max_install_names
 endif
 
 .PHONY: alltests alltests-recursive updatetests