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 e3bdabfcf3a4e85bc5c44bd7fe81643afd21d4ec..c7bcab1d881d4619cf83d5b6cf64864642ffb280 100644 (file)
--- a/src/tex2lyx/Makefile.am
+++ b/src/tex2lyx/Makefile.am
@@ -1,6 +1,5 @@
 include $(top_srcdir)/config/common.am
 
-INCLUDES = -I$(srcdir)/../ $(BOOST_INCLUDES)
 EXTRA_DIST = test-structure.tex test-insets.tex
 DISTCLEANFILES += $(BUILT_SOURCES)
 
@@ -14,6 +13,14 @@ DISTCLEANFILES += $(BUILT_SOURCES)
 
 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 \
@@ -46,8 +53,8 @@ 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 $@ ; \