fix compilation with external boost

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28444 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/config/common.am b/config/common.am
index b9739008506bca816574a523428bee0380a748a2..dc12d57a06e24a0c6755b9a7ced79a95a0d380b2 100644 (file)
--- a/config/common.am
+++ b/config/common.am
@@ -33,11 +33,7 @@ BOOST_INCLUDES = -I$(top_srcdir)/boost
 BOOST_LIBS = $(top_builddir)/boost/liblyxboost.a
 else
 BOOST_INCLUDES =
 BOOST_LIBS = $(top_builddir)/boost/liblyxboost.a
 else
 BOOST_INCLUDES =

-BOOST_FILESYSTEM = -lboost_filesystem
-BOOST_REGEX = -lboost_regex
-BOOST_SIGNALS = -lboost_signals
-BOOST_IOSTREAMS = -lboost_iostreams
-BOOST_LIBS = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS)
+BOOST_LIBS = -lboost_filesystem -lboost_regex -lboost_signals -lboost_iostreams

 endif
 
 LIBS =
 endif
 
 LIBS =

diff --git a/src/frontends/Makefile.am b/src/frontends/Makefile.am
index cec459a4c5b5f86a4c151133ca53c6093c673371..7dedcda8b6a25bb91bf4079734927376373ea61f 100644 (file)
--- a/src/frontends/Makefile.am
+++ b/src/frontends/Makefile.am
@@ -37,7 +37,7 @@ TESTS = \
 check_PROGRAMS = \
        biblio
 
 check_PROGRAMS = \
        biblio
 

-biblio_LDADD = $(BOOST_LIBS) $(BOOST_REGEX)
+biblio_LDADD = $(BOOST_LIBS)

 biblio_SOURCES = \
        tests/biblio.cpp \
        tests/boost.cpp
 biblio_SOURCES = \
        tests/biblio.cpp \
        tests/boost.cpp

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index d4ba1c223a0d8d7766cd3d7f11fd0b6a9413aab0..f6ebfe05f3bd4202404b81d10f418cf09f5547b3 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -7,8 +7,6 @@ EXTRA_DIST = pch.h \
 
 noinst_LIBRARIES = liblyxsupport.a
 
 
 noinst_LIBRARIES = liblyxsupport.a
 

-liblyxsupport_a_LIBADD = $(BOOST_SIGNALS)
-

 BUILT_SOURCES = $(PCH_FILE)
 
 #########################  Qt stuff  #############################
 BUILT_SOURCES = $(PCH_FILE)
 
 #########################  Qt stuff  #############################