diff --git a/boost/ChangeLog b/boost/ChangeLog index 7230853128..dda3ff3921 100644 --- a/boost/ChangeLog +++ b/boost/ChangeLog @@ -1,3 +1,15 @@ +2004-12-05 Lars Gullik Bjønnes + + * libs/signals/src/.cvsignore: libboostsignals -> libboost_signals + * libs/signals/src/Makefile.am: ditto + + * libs/regex/src/.cvsignore: libboostregex -> libboost_regex + * libs/regex/src/Makefile.am: ditto + + * libs/filesystem/src/.cvsignore: libboostfilesystem -> + libboost_filesystem + * libs/filesystem/src/Makefile.am: ditto + 2004-12-04 Lars Gullik Bjonnes * boost/config/compiler/gcc.hpp: all to compile with gcc 4.0 diff --git a/boost/libs/filesystem/src/.cvsignore b/boost/libs/filesystem/src/.cvsignore index a136b96fad..951333c829 100644 --- a/boost/libs/filesystem/src/.cvsignore +++ b/boost/libs/filesystem/src/.cvsignore @@ -1,6 +1,6 @@ Makefile Makefile.in -libboostfilesystem.la +libboost_filesystem.la *.lo .libs .deps diff --git a/boost/libs/filesystem/src/Makefile.am b/boost/libs/filesystem/src/Makefile.am index 6aaab5fe5b..438d0edf8d 100644 --- a/boost/libs/filesystem/src/Makefile.am +++ b/boost/libs/filesystem/src/Makefile.am @@ -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="" \ $(BOOST_INCLUDES) -libboostfilesystem_la_SOURCES = \ +libboost_filesystem_la_SOURCES = \ convenience.cpp \ exception.cpp \ Makefile.am \ diff --git a/boost/libs/regex/src/.cvsignore b/boost/libs/regex/src/.cvsignore index dfe394aaab..be415f747c 100644 --- a/boost/libs/regex/src/.cvsignore +++ b/boost/libs/regex/src/.cvsignore @@ -1,6 +1,6 @@ Makefile Makefile.in -libboostregex.la +libboost_regex.la *.lo .deps .libs diff --git a/boost/libs/regex/src/Makefile.am b/boost/libs/regex/src/Makefile.am index eac7882567..7674459d66 100644 --- a/boost/libs/regex/src/Makefile.am +++ b/boost/libs/regex/src/Makefile.am @@ -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="" \ $(BOOST_INCLUDES) -libboostregex_la_SOURCES = \ +libboost_regex_la_SOURCES = \ cpp_regex_traits.cpp \ c_regex_traits_common.cpp \ c_regex_traits.cpp \ diff --git a/boost/libs/signals/src/.cvsignore b/boost/libs/signals/src/.cvsignore index 9056e6188b..50306698e8 100644 --- a/boost/libs/signals/src/.cvsignore +++ b/boost/libs/signals/src/.cvsignore @@ -1,6 +1,6 @@ Makefile Makefile.in -libboostsignals.la +libboost_signals.la *.lo .deps .libs diff --git a/boost/libs/signals/src/Makefile.am b/boost/libs/signals/src/Makefile.am index 85840e8eb5..c84da747a5 100644 --- a/boost/libs/signals/src/Makefile.am +++ b/boost/libs/signals/src/Makefile.am @@ -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="" \ $(BOOST_INCLUDES) -libboostsignals_la_SOURCES = \ +libboost_signals_la_SOURCES = \ connection.cpp \ named_slot_map.cpp \ signal_base.cpp \ diff --git a/config/ChangeLog b/config/ChangeLog index fa0292368b..4bf64b4ea5 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,7 @@ +2004-12-05 Lars Gullik Bjønnes + + * common.am: setup variables for boost + 2004-12-04 Lars Gullik Bjonnes * lyxinclude.m4 (lyx_pch_comp): next gcc version is 4.0 not 3.5 diff --git a/config/common.am b/config/common.am index b155c096c8..3494eb0c10 100644 --- a/config/common.am +++ b/config/common.am @@ -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 = diff --git a/src/ChangeLog b/src/ChangeLog index 199c28c866..46ed6c39e9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2004-12-05 Lars Gullik Bjønnes + + * Makefile.am (BOOST_LIBS): use boost variables + 2004-12-03 José Matos * buffer.C: format up to 238. diff --git a/src/Makefile.am b/src/Makefile.am index 2601365faf..bac6639a51 100644 --- 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@ diff --git a/src/client/ChangeLog b/src/client/ChangeLog index f5fba9bb4f..02067ea1ae 100644 --- a/src/client/ChangeLog +++ b/src/client/ChangeLog @@ -1,3 +1,7 @@ +2004-12-05 Lars Gullik Bjønnes + + * Makefile.am (BOOST_LIBS): use boost variables + 2004-11-09 Georg Baum * client.C: remove format hack diff --git a/src/client/Makefile.am b/src/client/Makefile.am index 8b0767282c..8da3e2ac90 100644 --- a/src/client/Makefile.am +++ b/src/client/Makefile.am @@ -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 \ diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index c357d95216..69983e0873 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,7 @@ +2004-12-05 Lars Gullik Bjønnes + + * Makefile.am (AM_CPPFLAGS): reformat slightly + 2004-12-03 Lars Gullik Bjonnes * Makefile.am, ui/Makefile.am (AM_CPPFLAGS): fix typo diff --git a/src/frontends/qt2/Makefile.am b/src/frontends/qt2/Makefile.am index eb7e95a2e0..2e3823c750 100644 --- a/src/frontends/qt2/Makefile.am +++ b/src/frontends/qt2/Makefile.am @@ -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 diff --git a/src/tex2lyx/ChangeLog b/src/tex2lyx/ChangeLog index 0c8c2b3f60..85a53893c5 100644 --- a/src/tex2lyx/ChangeLog +++ b/src/tex2lyx/ChangeLog @@ -1,3 +1,7 @@ +2004-12-05 Lars Gullik Bjønnes + + * Makefile.am (tex2lyx_LDADD): use boost variables + 2004-11-27 Georg Baum * table.C (handle_colalign): handle comments diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am index 1e84ba2774..1939e59cfb 100644 --- a/src/tex2lyx/Makefile.am +++ b/src/tex2lyx/Makefile.am @@ -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 $@ ; \