some tabular fixes for the problems reported by Helge

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

diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am
index 7b22fe5f49bbae3ff5eec195f01608d655c69169..c7bcab1d881d4619cf83d5b6cf64864642ffb280 100644 (file)
--- a/src/tex2lyx/Makefile.am
+++ b/src/tex2lyx/Makefile.am
@@ -1,8 +1,7 @@
 include $(top_srcdir)/config/common.am
 
-INCLUDES = -I$(srcdir)/../ $(BOOST_INCLUDES)
 EXTRA_DIST = test-structure.tex test-insets.tex
-DISTCLEANFILES += $(linked_files)
+DISTCLEANFILES += $(BUILT_SOURCES)
 
 #noinst_LTLIBRARIES = libtexparser.la
 #
@@ -14,6 +13,14 @@ DISTCLEANFILES += $(linked_files)
 
 bin_PROGRAMS = tex2lyx
 
+AM_CPPFLAGS = $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
+
+BOOST_LIBS = $(BOOST_REGEX) $(BOOST_FILESYSTEM)
+
+if USE_COMPRESSION
+COMPRESSIONLIB = -lz
+endif
+
 BUILT_SOURCES = \
        FloatList.C \
        Floating.C \
@@ -33,6 +40,7 @@ tex2lyx_SOURCES = \
        context.h \
        gettext.C \
        gettext.h \
+       lengthcommon.C \
        lyxfont.C \
        lyxfont.h \
        texparser.C \
@@ -45,12 +53,12 @@ tex2lyx_SOURCES = \
        text.C
 
 tex2lyx_LDADD = \
-       ../support/libsupport.la \
-       ../../boost/libs/regex/src/libboostregex.la -lz
+       $(top_builddir)/src/support/libsupport.la \
+       $(BOOST_LIBS) $(COMPRESSIONLIB)
 
 $(BUILT_SOURCES) :
        @rm -f $@ ; \
        $(LN_S) $(top_srcdir)/src/$@ .
 
 rm_link_files:
-       rm -f $(linked_files)
+       rm -f $(BUILT_SOURCES)