mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-22 01:59:02 +00:00
fix compilation with external boost
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28444 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
b9df3d88c9
commit
209f2167f0
@ -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 =
|
||||
|
@ -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
|
||||
|
@ -7,8 +7,6 @@ EXTRA_DIST = pch.h \
|
||||
|
||||
noinst_LIBRARIES = liblyxsupport.a
|
||||
|
||||
liblyxsupport_a_LIBADD = $(BOOST_SIGNALS)
|
||||
|
||||
BUILT_SOURCES = $(PCH_FILE)
|
||||
|
||||
######################### Qt stuff #############################
|
||||
|
Loading…
Reference in New Issue
Block a user