remove special TEX2LYX code in Spacing,h

[lyx.git] / src / tex2lyx / Makefile.am

diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am
index c6df6470d2489e99a1342c7dc6c604841ed389a6..975195e3525ab9c6704cb2d3c9fbf04fe000ebcb 100644 (file)
--- a/src/tex2lyx/Makefile.am
+++ b/src/tex2lyx/Makefile.am
@@ -1,17 +1,14 @@
 include $(top_srcdir)/config/common.am
 
-EXTRA_DIST = tex2lyx.man test-structure.tex test-insets.tex
-EXTRA_DIST += pch.h
+EXTRA_DIST = tex2lyx.1in $(TEST_FILES) pch.h
 
-DISTCLEANFILES += tex2lyx.1
-
-#noinst_LTLIBRARIES = libtexparser.la
+#noinst_LIBRARIES = libtexparser.a
 #
-#libtexparser_la_SOURCES = \
+#libtexparser_a_SOURCES = \
 #      Parser.cpp \
 #      Parser.h
 #
-#tex2lyx_LDADD = libtexparser.la
+#tex2lyx_LDADD = libtexparser.a
 
 man_MANS = tex2lyx.1
 
@@ -19,51 +16,53 @@ bin_PROGRAMS = tex2lyx
 
 DEFAULT_INCLUDES = 
 
-AM_CPPFLAGS += \
-       -DTEX2LYX \
-       $(PCH_FLAGS) \
-       -I$(top_srcdir)/src/tex2lyx \
-       -I$(top_srcdir)/src  \
-       -I$(top_builddir)/src \
-       $(BOOST_INCLUDES)
+AM_CPPFLAGS += -DTEX2LYX $(PCH_FLAGS) -I$(top_srcdir)/src/tex2lyx \
+       -I$(top_srcdir)/src -I$(top_builddir) $(BOOST_INCLUDES)
 
+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 = \
+       ../Color.cpp \
+       ../Counters.cpp \
+       ../Encoding.cpp \
        ../FloatList.cpp \
        ../Floating.cpp \
-       ../Counters.cpp \
-       ../Layout.h \
+       ../FontInfo.cpp \
+       ../insets/InsetLayout.cpp \
        ../Layout.cpp \
-       ../TextClass.cpp \
-       ../TextClass.h \
+       ../LayoutModuleList.cpp \
+       ../lengthcommon.cpp \
        ../Lexer.cpp \
-       ../Color.cpp \
-       ../Color.h
+       ../ModuleList.cpp \
+       ../Spacing.cpp \
+       ../TextClass.cpp \
+       ../TextClass.h
 
 BUILT_SOURCES = $(PCH_FILE)
 
 tex2lyx_SOURCES = \
        $(LINKED_FILES) \
-       Spacing.h \
        boost.cpp \
        Context.cpp \
        Context.h \
-       Font.cpp \
-       Font.h \
-       gettext.cpp \
-       lengthcommon.cpp \
+       math.cpp \
        Parser.cpp \
        Parser.h \
-       tex2lyx.cpp \
-       tex2lyx.h \
        preamble.cpp \
-       math.cpp \
        table.cpp \
+       tex2lyx.cpp \
+       tex2lyx.h \
        text.cpp
 
 tex2lyx_LDADD = \
-       $(top_builddir)/src/support/liblyxsupport.la \
-       $(LIBICONV) $(BOOST_LIBS) @LIBS@
-
-tex2lyx.1:
-       cp -p $(srcdir)/tex2lyx.man tex2lyx.1
+       $(top_builddir)/src/support/liblyxsupport.a \
+       $(INTLLIBS) $(LIBICONV) $(BOOST_LIBS) \
+       $(QT4_LIB) $(QT4_LDFLAGS) \
+       @LIBS@ $(LIBSHLWAPI) $(LIBPSAPI)