* Replace all use of 'slashify_path' with 'internal_path'.

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 275246adbfe26f48e0293cc2e9c3339d705d6d82..bac6639a517f2c846679813da0dbe73ba243da04 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,12 +20,7 @@ LYX_POST_LIBS = frontends/controllers/libcontrollers.la \
        graphics/libgraphics.la \
        support/libsupport.la
 
-if USE_INCLUDED_BOOST
-BOOST_LIBS = $(top_builddir)/boost/libs/regex/src/libboostregex.la \
-       $(top_builddir)/boost/libs/signals/src/libboostsignals.la
-else
-BOOST_LIBS = -lboost_regex -lboost_signals
-endif
+BOOST_LIBS = $(BOOST_REGEX) $(BOOST_SIGNALS)
 
 OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(AIKSAURUS_LIBS) @LIBS@
 
@@ -54,9 +49,7 @@ lyx$(EXEEXT): $(FRONTENDS_PROGS)
 
 BUILT_SOURCES = version.C
 
-AM_CPPFLAGS = $(BOOST_INCLUDES)
-
-AM_CXXFLAGS = $(PCH_FLAGS)
+AM_CPPFLAGS = $(PCH_FLAGS) $(BOOST_INCLUDES)
 
 lyx_SOURCES = \
        Bidi.C \