Also rename the boost convenience libs to the same names used on the
external lib.
Will commit rs.
? Config
? boost-1.diff
Index: boost/libs/filesystem/src/.cvsignore
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/boost/libs/filesystem/src/.cvsignore,v
retrieving revision 1.2
diff -u -p -B -b -w -r1.2 .cvsignore
--- boost/libs/filesystem/src/.cvsignore 18 Aug 2004 14:20:15 -0000 1.2
+++ boost/libs/filesystem/src/.cvsignore 5 Dec 2004 16:24:52 -0000
@@ -1,6 +1,6 @@
Makefile
Makefile.in
-libboostfilesystem.la
+libboost_filesystem.la
*.lo
.libs
.deps
Index: boost/libs/filesystem/src/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/boost/libs/filesystem/src/Makefile.am,v
retrieving revision 1.5
diff -u -p -B -b -w -r1.5 Makefile.am
--- boost/libs/filesystem/src/Makefile.am 4 Dec 2004 14:50:22 -0000 1.5
+++ boost/libs/filesystem/src/Makefile.am 5 Dec 2004 16:24:52 -0000
@@ -1,13 +1,13 @@
include $(top_srcdir)/config/common.am
-noinst_LTLIBRARIES = libboostfilesystem.la
+noinst_LTLIBRARIES = libboost_filesystem.la
AM_CPPFLAGS = \
$(PCH_FLAGS) \
-DBOOST_USER_CONFIG="<config.h>" \
$(BOOST_INCLUDES)
-libboostfilesystem_la_SOURCES = \
+libboost_filesystem_la_SOURCES = \
convenience.cpp \
exception.cpp \
Makefile.am \
Index: boost/libs/regex/src/.cvsignore
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/boost/libs/regex/src/.cvsignore,v
retrieving revision 1.4
diff -u -p -B -b -w -r1.4 .cvsignore
--- boost/libs/regex/src/.cvsignore 18 Aug 2004 14:20:16 -0000 1.4
+++ boost/libs/regex/src/.cvsignore 5 Dec 2004 16:24:52 -0000
@@ -1,6 +1,6 @@
Makefile
Makefile.in
-libboostregex.la
+libboost_regex.la
*.lo
.deps
.libs
Index: boost/libs/regex/src/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/boost/libs/regex/src/Makefile.am,v
retrieving revision 1.11
diff -u -p -B -b -w -r1.11 Makefile.am
--- boost/libs/regex/src/Makefile.am 4 Dec 2004 14:50:22 -0000 1.11
+++ boost/libs/regex/src/Makefile.am 5 Dec 2004 16:24:52 -0000
@@ -1,13 +1,13 @@
include $(top_srcdir)/config/common.am
-noinst_LTLIBRARIES = libboostregex.la
+noinst_LTLIBRARIES = libboost_regex.la
AM_CPPFLAGS = \
$(PCH_FLAGS) \
-DBOOST_USER_CONFIG="<config.h>" \
$(BOOST_INCLUDES)
-libboostregex_la_SOURCES = \
+libboost_regex_la_SOURCES = \
cpp_regex_traits.cpp \
c_regex_traits_common.cpp \
c_regex_traits.cpp \
Index: boost/libs/signals/src/.cvsignore
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/boost/libs/signals/src/.cvsignore,v
retrieving revision 1.3
diff -u -p -B -b -w -r1.3 .cvsignore
--- boost/libs/signals/src/.cvsignore 18 Aug 2004 14:20:16 -0000 1.3
+++ boost/libs/signals/src/.cvsignore 5 Dec 2004 16:24:52 -0000
@@ -1,6 +1,6 @@
Makefile
Makefile.in
-libboostsignals.la
+libboost_signals.la
*.lo
.deps
.libs
Index: boost/libs/signals/src/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/boost/libs/signals/src/Makefile.am,v
retrieving revision 1.6
diff -u -p -B -b -w -r1.6 Makefile.am
--- boost/libs/signals/src/Makefile.am 4 Dec 2004 14:50:22 -0000 1.6
+++ boost/libs/signals/src/Makefile.am 5 Dec 2004 16:24:52 -0000
@@ -1,13 +1,13 @@
include $(top_srcdir)/config/common.am
-noinst_LTLIBRARIES = libboostsignals.la
+noinst_LTLIBRARIES = libboost_signals.la
AM_CPPFLAGS = \
$(PCH_FLAGS) \
-DBOOST_USER_CONFIG="<config.h>" \
$(BOOST_INCLUDES)
-libboostsignals_la_SOURCES = \
+libboost_signals_la_SOURCES = \
connection.cpp \
named_slot_map.cpp \
signal_base.cpp \
Index: config/common.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/common.am,v
retrieving revision 1.12
diff -u -p -B -b -w -r1.12 common.am
--- config/common.am 4 Dec 2004 12:45:48 -0000 1.12
+++ config/common.am 5 Dec 2004 16:24:52 -0000
@@ -31,6 +31,14 @@ SUFFIXES = .gch
if USE_INCLUDED_BOOST
BOOST_INCLUDES = -I$(top_srcdir)/boost
+BOOST_FILESYSTEM = $(top_builddir)/boost/libs/filesystem/src/libboost_filesystem.la
+BOOST_REGEX = $(top_builddir)/boost/libs/regex/src/libboost_regex.la
+BOOST_SIGNALS = $(top_builddir)/boost/libs/signals/src/libboost_signals.la
+else
+BOOST_INCLUDES =
+BOOST_FILESYSTEM = -lboost_filesystem
+BOOST_REGEX = -lboost_regex
+BOOST_SIGNALS = -lboost_signals
endif
LIBS =
Index: src/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/Makefile.am,v
retrieving revision 1.221
diff -u -p -B -b -w -r1.221 Makefile.am
--- src/Makefile.am 4 Dec 2004 14:50:23 -0000 1.221
+++ src/Makefile.am 5 Dec 2004 16:24:53 -0000
@@ -20,12 +20,7 @@ LYX_POST_LIBS = frontends/controllers/li
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@
Index: src/client/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/client/Makefile.am,v
retrieving revision 1.6
diff -u -p -B -b -w -r1.6 Makefile.am
--- src/client/Makefile.am 4 Dec 2004 14:50:23 -0000 1.6
+++ src/client/Makefile.am 5 Dec 2004 16:24:53 -0000
@@ -8,12 +8,7 @@ bin_PROGRAMS = lyxclient
AM_CPPFLAGS = $(PCH_FLAGS) -I$(srcdir)/../ $(BOOST_INCLUDES)
-if USE_INCLUDED_BOOST
-BOOST_LIBS = $(top_builddir)/boost/libs/filesystem/src/libboostfilesystem.la \
- $(top_builddir)/boost/libs/regex/src/libboostregex.la
-else
-BOOST_LIBS = -lboost_regex -lboost_filesystem
-endif
+BOOST_LIBS = $(BOOST_REGEX) $(BOOST_FILESYSTEM)
lyxclient_LDADD = \
$(top_builddir)/src/support/libsupport.la \
Index: src/frontends/qt2/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/Makefile.am,v
retrieving revision 1.99
diff -u -p -B -b -w -r1.99 Makefile.am
--- src/frontends/qt2/Makefile.am 4 Dec 2004 14:50:23 -0000 1.99
+++ src/frontends/qt2/Makefile.am 5 Dec 2004 16:24:53 -0000
@@ -14,7 +14,8 @@ AM_CPPFLAGS = \
-DQT_CLEAN_NAMESPACE \
-DQT_GENUINE_STR \
$(PCH_FLAGS) \
- -I$(top_srcdir)/src/ -I$(top_srcdir)/src/frontends/ \
+ -I$(top_srcdir)/src/ \
+ -I$(top_srcdir)/src/frontends/ \
-I$(top_srcdir)/images \
$(QT_INCLUDES) $(BOOST_INCLUDES) \
-I$(top_srcdir)/src/frontends/controllers
Index: src/tex2lyx/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/tex2lyx/Makefile.am,v
retrieving revision 1.20
diff -u -p -B -b -w -r1.20 Makefile.am
--- src/tex2lyx/Makefile.am 4 Dec 2004 14:50:25 -0000 1.20
+++ src/tex2lyx/Makefile.am 5 Dec 2004 16:24:53 -0000
@@ -47,8 +47,8 @@ tex2lyx_SOURCES = \
text.C
tex2lyx_LDADD = \
- ../support/libsupport.la \
- ../../boost/libs/regex/src/libboostregex.la -lz
+ $(top_builddir)/src/support/libsupport.la \
+ $(BOOST_REGEX) -lz
$(BUILT_SOURCES) :
@rm -f $@ ; \
--
Lgb
