X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2FMakefile.am;h=c6df6470d2489e99a1342c7dc6c604841ed389a6;hb=309c75046e71cc78f1968cff8ee10aaae1a62af7;hp=f5964e39a2e5712288db06fc54c880ce7ae2ac7e;hpb=6add1994c75c0f3e0db50ab6c94ac3b73deb1561;p=lyx.git

diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am
index f5964e39a2..c6df6470d2 100644
--- a/src/tex2lyx/Makefile.am
+++ b/src/tex2lyx/Makefile.am
@@ -1,8 +1,9 @@
 include $(top_srcdir)/config/common.am
 
-EXTRA_DIST = tex2lyx.man pch.h test-structure.tex test-insets.tex
+EXTRA_DIST = tex2lyx.man test-structure.tex test-insets.tex
+EXTRA_DIST += pch.h
 
-DISTCLEANFILES += tex2lyx.1 $(LINKED_FILES)
+DISTCLEANFILES += tex2lyx.1
 
 #noinst_LTLIBRARIES = libtexparser.la
 #
@@ -16,23 +17,30 @@ man_MANS = tex2lyx.1
 
 bin_PROGRAMS = tex2lyx
 
-AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
+DEFAULT_INCLUDES = 
 
-BOOST_LIBS = $(BOOST_REGEX) $(BOOST_FILESYSTEM) $(BOOST_IOSTREAMS)
+AM_CPPFLAGS += \
+	-DTEX2LYX \
+	$(PCH_FLAGS) \
+	-I$(top_srcdir)/src/tex2lyx \
+	-I$(top_srcdir)/src  \
+	-I$(top_builddir)/src \
+	$(BOOST_INCLUDES)
 
-COMPRESSIONLIB = -lz
 
 LINKED_FILES = \
-	FloatList.cpp \
-	Floating.cpp \
-	Counters.cpp \
-	Layout.h \
-	Layout.cpp \
-	TextClass.cpp \
-	TextClass.h \
-	Lexer.cpp 
+	../FloatList.cpp \
+	../Floating.cpp \
+	../Counters.cpp \
+	../Layout.h \
+	../Layout.cpp \
+	../TextClass.cpp \
+	../TextClass.h \
+	../Lexer.cpp \
+	../Color.cpp \
+	../Color.h
 
-BUILT_SOURCES = $(PCH_FILE) $(LINKED_FILES)
+BUILT_SOURCES = $(PCH_FILE)
 
 tex2lyx_SOURCES = \
 	$(LINKED_FILES) \
@@ -54,15 +62,8 @@ tex2lyx_SOURCES = \
 	text.cpp
 
 tex2lyx_LDADD = \
-	$(top_builddir)/src/support/libsupport.la \
-	$(BOOST_LIBS) $(LIBICONV) @LIBS@ $(COMPRESSIONLIB)
-
-$(LINKED_FILES) :
-	@rm -f $@ ; \
-	$(LN_S) $(top_srcdir)/src/$@ .
-
-rm_link_files:
-	rm -f $(LINKED_FILES)
+	$(top_builddir)/src/support/liblyxsupport.la \
+	$(LIBICONV) $(BOOST_LIBS) @LIBS@
 
 tex2lyx.1:
 	cp -p $(srcdir)/tex2lyx.man tex2lyx.1