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

diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am
index f54094cb79..c6df6470d2 100644
--- a/src/tex2lyx/Makefile.am
+++ b/src/tex2lyx/Makefile.am
@@ -1,14 +1,15 @@
 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
 #
 #libtexparser_la_SOURCES = \
-#	texparser.C \
-#	texparser.h
+#	Parser.cpp \
+#	Parser.h
 #
 #tex2lyx_LDADD = libtexparser.la
 
@@ -16,57 +17,53 @@ 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)
 
-if USE_COMPRESSION
-COMPRESSIONLIB = -lz
-endif
 
 LINKED_FILES = \
-	FloatList.C \
-	Floating.C \
-	counters.C \
-	lyxlayout.h \
-	lyxlayout.C \
-	lyxtextclass.C \
-	lyxtextclass.h \
-	lyxlex.C \
-	lyxlex_pimpl.C
+	../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) \
 	Spacing.h \
-	boost.C \
-	context.C \
-	context.h \
-	gettext.C \
-	gettext.h \
-	lengthcommon.C \
-	lyxfont.C \
-	lyxfont.h \
-	texparser.C \
-	texparser.h \
-	tex2lyx.C \
+	boost.cpp \
+	Context.cpp \
+	Context.h \
+	Font.cpp \
+	Font.h \
+	gettext.cpp \
+	lengthcommon.cpp \
+	Parser.cpp \
+	Parser.h \
+	tex2lyx.cpp \
 	tex2lyx.h \
-	preamble.C \
-	math.C \
-	table.C \
-	text.C
+	preamble.cpp \
+	math.cpp \
+	table.cpp \
+	text.cpp
 
 tex2lyx_LDADD = \
-	$(top_builddir)/src/support/libsupport.la \
-	$(BOOST_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