X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2FMakefile.am;h=bf2d66d67f81e9f7773f07756d900e37654f9046;hb=f179173e423469eb95cab6a5c7dd6ac317d4831b;hp=45c27202a7d4816a8ff280b7a9d2a47c9ccbfd06;hpb=4a5efb5a7d1b50325def2944df5faf511cd5d961;p=lyx.git

diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am
index 45c27202a7..bf2d66d67f 100644
--- a/src/tex2lyx/Makefile.am
+++ b/src/tex2lyx/Makefile.am
@@ -1,6 +1,6 @@
 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
@@ -17,9 +17,9 @@ bin_PROGRAMS = tex2lyx
 
 DEFAULT_INCLUDES =
 
-AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src/tex2lyx \
+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 \
@@ -33,7 +33,7 @@ TEST_FILES = \
 	test/foo.eps \
 	test/foo.png \
 	test/test-insets.tex \
-	test/test-insets-basic.lyx \
+	test/test-insets-basic.tex \
 	test/test.ltx \
 	test/test-memoir.tex \
 	test/test-modules.tex \
@@ -105,8 +105,6 @@ LINKED_FILES = \
 	../TextClass.cpp \
 	../version.cpp
 
-BUILT_SOURCES = $(PCH_FILE)
-
 tex2lyx_SOURCES = \
 	$(LINKED_FILES) \
 	boost.cpp \
@@ -127,10 +125,12 @@ tex2lyx_LDADD = \
 	$(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