anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix compilation with external boost

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28444 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2009-02-11 14:27:42 +00:00
parent b9df3d88c9
commit 209f2167f0
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/common.am
View File

@ -33,11 +33,7 @@ BOOST_INCLUDES = -I$(top_srcdir)/boost
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 =

2
src/frontends/Makefile.am
View File

@ -37,7 +37,7 @@ TESTS = \
check_PROGRAMS = \
biblio
biblio_LDADD = $(BOOST_LIBS) $(BOOST_REGEX)
biblio_LDADD = $(BOOST_LIBS)
biblio_SOURCES = \
tests/biblio.cpp \
tests/boost.cpp

2
src/support/Makefile.am
View File

@ -7,8 +7,6 @@ EXTRA_DIST = pch.h \
noinst_LIBRARIES = liblyxsupport.a
liblyxsupport_a_LIBADD = $(BOOST_SIGNALS)
BUILT_SOURCES = $(PCH_FILE)
######################### Qt stuff #############################