X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2FMakefile.am;h=04aa8ec3b6e9d9a6cd1e72cd47c16735e653bf29;hb=55a3dd7b346d29a52ba305a4558e9e380ef50f47;hp=980f4ca1eee68e62b81b779424541a75a4d1a171;hpb=8cc9180ba8b606837a9e874014c8191cd85f9310;p=lyx.git

diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am
index 980f4ca1ee..04aa8ec3b6 100644
--- a/src/tex2lyx/Makefile.am
+++ b/src/tex2lyx/Makefile.am
@@ -1,69 +1,77 @@
 include $(top_srcdir)/config/common.am
 
-EXTRA_DIST = tex2lyx.man pch.h test-structure.tex test-insets.tex
+EXTRA_DIST = TODO.txt tex2lyx.1in $(TEST_FILES) pch.h
 
-DISTCLEANFILES += tex2lyx.1 $(LINKED_FILES)
-
-#noinst_LTLIBRARIES = libtexparser.la
+#noinst_LIBRARIES = libtexparser.a
 #
-#libtexparser_la_SOURCES = \
-#	texparser.C \
-#	texparser.h
+#libtexparser_a_SOURCES = \
+#	Parser.cpp \
+#	Parser.h
 #
-#tex2lyx_LDADD = libtexparser.la
+#tex2lyx_LDADD = libtexparser.a
 
 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) $(BOOST_INCLUDES)
 
-COMPRESSIONLIB = -lz
+TEST_FILES = \
+	test/box-color-size-space-align.tex \
+	test/DummyDocument.tex \
+	test/foo.eps \
+	test/foo.png \
+	test/test-insets.tex \
+	test/test.ltx \
+	test/test-structure.tex
 
 LINKED_FILES = \
-	FloatList.C \
-	Floating.C \
-	counters.C \
-	lyxlayout.h \
-	lyxlayout.C \
-	lyxtextclass.C \
-	lyxtextclass.h \
-	lyxlex.C \
-	lyxlex_pimpl.C
+	../Author.cpp \
+	../Color.cpp \
+	../Counters.cpp \
+	../Encoding.cpp \
+	../FloatList.cpp \
+	../Floating.cpp \
+	../FontInfo.cpp \
+	../insets/InsetLayout.cpp \
+	../LaTeXPackages.cpp \
+	../Layout.cpp \
+	../LayoutFile.cpp \
+	../LayoutModuleList.cpp \
+	../lengthcommon.cpp \
+	../Lexer.cpp \
+	../ModuleList.cpp \
+	../Spacing.cpp \
+	../TextClass.cpp \
+	../TextClass.h \
+	../version.cpp
 
-BUILT_SOURCES = $(PCH_FILE) $(LINKED_FILES)
+BUILT_SOURCES = $(PCH_FILE)
 
 tex2lyx_SOURCES = \
 	$(LINKED_FILES) \
-	Spacing.h \
-	boost.C \
-	context.C \
-	context.h \
-	gettext.C \
-	lengthcommon.C \
-	lyxfont.C \
-	lyxfont.h \
-	texparser.C \
-	texparser.h \
-	tex2lyx.C \
+	boost.cpp \
+	Context.cpp \
+	Context.h \
+	math.cpp \
+	Parser.cpp \
+	Parser.h \
+	Preamble.cpp \
+	Preamble.h \
+	table.cpp \
+	tex2lyx.cpp \
 	tex2lyx.h \
-	preamble.C \
-	math.C \
-	table.C \
-	text.C
+	text.cpp
 
 tex2lyx_LDADD = \
-	$(top_builddir)/src/support/libsupport.la \
-	$(BOOST_LIBS) $(LIBICONV) $(COMPRESSIONLIB)
-
-$(LINKED_FILES) :
-	@rm -f $@ ; \
-	$(LN_S) $(top_srcdir)/src/$@ .
-
-rm_link_files:
-	rm -f $(LINKED_FILES)
+	$(top_builddir)/src/support/liblyxsupport.a \
+	$(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) \
+	$(QT4_LIB) $(QT4_LDFLAGS) \
+	@LIBS@ $(LIBSHLWAPI) $(LIBPSAPI)
 
-tex2lyx.1:
-	cp -p $(srcdir)/tex2lyx.man tex2lyx.1
+if INSTALL_MACOSX
+tex2lyx_LDFLAGS = -framework AppKit
+endif