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

rename boost libs, add some boost variables for automake, and use them

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9343 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2004-12-05 17:10:58 +00:00
parent 855a20adb9
commit 7ef4c4070c
17 changed files with 55 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
boost/ChangeLog
View File

@ -1,3 +1,15 @@
2004-12-05 Lars Gullik Bjønnes <larsbj@lyx.org>
* 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 <larsbj@gullik.net> 2004-12-04 Lars Gullik Bjonnes <larsbj@gullik.net>
* boost/config/compiler/gcc.hpp: all to compile with gcc 4.0 * boost/config/compiler/gcc.hpp: all to compile with gcc 4.0

2
boost/libs/filesystem/src/.cvsignore
View File

@ -1,6 +1,6 @@
Makefile Makefile
Makefile.in Makefile.in
libboostfilesystem.la libboost_filesystem.la
*.lo *.lo
.libs .libs
.deps .deps

4
boost/libs/filesystem/src/Makefile.am
View File

@ -1,13 +1,13 @@
include $(top_srcdir)/config/common.am include $(top_srcdir)/config/common.am
noinst_LTLIBRARIES = libboostfilesystem.la noinst_LTLIBRARIES = libboost_filesystem.la
AM_CPPFLAGS = \ AM_CPPFLAGS = \
$(PCH_FLAGS) \ $(PCH_FLAGS) \
-DBOOST_USER_CONFIG="<config.h>" \ -DBOOST_USER_CONFIG="<config.h>" \
$(BOOST_INCLUDES) $(BOOST_INCLUDES)
libboostfilesystem_la_SOURCES = \ libboost_filesystem_la_SOURCES = \
convenience.cpp \ convenience.cpp \
exception.cpp \ exception.cpp \
Makefile.am \ Makefile.am \

2
boost/libs/regex/src/.cvsignore
View File

@ -1,6 +1,6 @@
Makefile Makefile
Makefile.in Makefile.in
libboostregex.la libboost_regex.la
*.lo *.lo
.deps .deps
.libs .libs

4
boost/libs/regex/src/Makefile.am
View File

@ -1,13 +1,13 @@
include $(top_srcdir)/config/common.am include $(top_srcdir)/config/common.am
noinst_LTLIBRARIES = libboostregex.la noinst_LTLIBRARIES = libboost_regex.la
AM_CPPFLAGS = \ AM_CPPFLAGS = \
$(PCH_FLAGS) \ $(PCH_FLAGS) \
-DBOOST_USER_CONFIG="<config.h>" \ -DBOOST_USER_CONFIG="<config.h>" \
$(BOOST_INCLUDES) $(BOOST_INCLUDES)
libboostregex_la_SOURCES = \ libboost_regex_la_SOURCES = \
cpp_regex_traits.cpp \ cpp_regex_traits.cpp \
c_regex_traits_common.cpp \ c_regex_traits_common.cpp \
c_regex_traits.cpp \ c_regex_traits.cpp \

2
boost/libs/signals/src/.cvsignore
View File

@ -1,6 +1,6 @@
Makefile Makefile
Makefile.in Makefile.in
libboostsignals.la libboost_signals.la
*.lo *.lo
.deps .deps
.libs .libs

4
boost/libs/signals/src/Makefile.am
View File

@ -1,13 +1,13 @@
include $(top_srcdir)/config/common.am include $(top_srcdir)/config/common.am
noinst_LTLIBRARIES = libboostsignals.la noinst_LTLIBRARIES = libboost_signals.la
AM_CPPFLAGS = \ AM_CPPFLAGS = \
$(PCH_FLAGS) \ $(PCH_FLAGS) \
-DBOOST_USER_CONFIG="<config.h>" \ -DBOOST_USER_CONFIG="<config.h>" \
$(BOOST_INCLUDES) $(BOOST_INCLUDES)
libboostsignals_la_SOURCES = \ libboost_signals_la_SOURCES = \
connection.cpp \ connection.cpp \
named_slot_map.cpp \ named_slot_map.cpp \
signal_base.cpp \ signal_base.cpp \

4
config/ChangeLog
View File

@ -1,3 +1,7 @@
2004-12-05 Lars Gullik Bjønnes <larsbj@lyx.org>
* common.am: setup variables for boost
2004-12-04 Lars Gullik Bjonnes <larsbj@gullik.net> 2004-12-04 Lars Gullik Bjonnes <larsbj@gullik.net>
* lyxinclude.m4 (lyx_pch_comp): next gcc version is 4.0 not 3.5 * lyxinclude.m4 (lyx_pch_comp): next gcc version is 4.0 not 3.5

8
config/common.am
View File

@ -31,6 +31,14 @@ SUFFIXES = .gch
if USE_INCLUDED_BOOST if USE_INCLUDED_BOOST
BOOST_INCLUDES = -I$(top_srcdir)/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 endif
LIBS = LIBS =

4
src/ChangeLog
View File

@ -1,3 +1,7 @@
2004-12-05 Lars Gullik Bjønnes <larsbj@lyx.org>
* Makefile.am (BOOST_LIBS): use boost variables
2004-12-03 José Matos <jamatos@lyx.org> 2004-12-03 José Matos <jamatos@lyx.org>
* buffer.C: format up to 238. * buffer.C: format up to 238.

7
src/Makefile.am
View File

@ -20,12 +20,7 @@ LYX_POST_LIBS = frontends/controllers/libcontrollers.la \
graphics/libgraphics.la \ graphics/libgraphics.la \
support/libsupport.la support/libsupport.la
if USE_INCLUDED_BOOST BOOST_LIBS = $(BOOST_REGEX) $(BOOST_SIGNALS)
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
OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(AIKSAURUS_LIBS) @LIBS@ OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(AIKSAURUS_LIBS) @LIBS@

4
src/client/ChangeLog
View File

@ -1,3 +1,7 @@
2004-12-05 Lars Gullik Bjønnes <larsbj@lyx.org>
* Makefile.am (BOOST_LIBS): use boost variables
2004-11-09 Georg Baum <Georg.Baum@post.rwth-aachen.de> 2004-11-09 Georg Baum <Georg.Baum@post.rwth-aachen.de>
* client.C: remove format hack * client.C: remove format hack

7
src/client/Makefile.am
View File

@ -8,12 +8,7 @@ bin_PROGRAMS = lyxclient
AM_CPPFLAGS = $(PCH_FLAGS) -I$(srcdir)/../ $(BOOST_INCLUDES) AM_CPPFLAGS = $(PCH_FLAGS) -I$(srcdir)/../ $(BOOST_INCLUDES)
if USE_INCLUDED_BOOST BOOST_LIBS = $(BOOST_REGEX) $(BOOST_FILESYSTEM)
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
lyxclient_LDADD = \ lyxclient_LDADD = \
$(top_builddir)/src/support/libsupport.la \ $(top_builddir)/src/support/libsupport.la \

4
src/frontends/qt2/ChangeLog
View File

@ -1,3 +1,7 @@
2004-12-05 Lars Gullik Bjønnes <larsbj@lyx.org>
* Makefile.am (AM_CPPFLAGS): reformat slightly
2004-12-03 Lars Gullik Bjonnes <larsbj@gullik.net> 2004-12-03 Lars Gullik Bjonnes <larsbj@gullik.net>
* Makefile.am, ui/Makefile.am (AM_CPPFLAGS): fix typo * Makefile.am, ui/Makefile.am (AM_CPPFLAGS): fix typo

3
src/frontends/qt2/Makefile.am
View File

@ -14,7 +14,8 @@ AM_CPPFLAGS = \
-DQT_CLEAN_NAMESPACE \ -DQT_CLEAN_NAMESPACE \
-DQT_GENUINE_STR \ -DQT_GENUINE_STR \
$(PCH_FLAGS) \ $(PCH_FLAGS) \
-I$(top_srcdir)/src/ -I$(top_srcdir)/src/frontends/ \ -I$(top_srcdir)/src/ \
-I$(top_srcdir)/src/frontends/ \
-I$(top_srcdir)/images \ -I$(top_srcdir)/images \
$(QT_INCLUDES) $(BOOST_INCLUDES) \ $(QT_INCLUDES) $(BOOST_INCLUDES) \
-I$(top_srcdir)/src/frontends/controllers -I$(top_srcdir)/src/frontends/controllers

4
src/tex2lyx/ChangeLog
View File

@ -1,3 +1,7 @@
2004-12-05 Lars Gullik Bjønnes <larsbj@lyx.org>
* Makefile.am (tex2lyx_LDADD): use boost variables
2004-11-27 Georg Baum <Georg.Baum@post.rwth-aachen.de> 2004-11-27 Georg Baum <Georg.Baum@post.rwth-aachen.de>
* table.C (handle_colalign): handle comments * table.C (handle_colalign): handle comments

4
src/tex2lyx/Makefile.am
View File

@ -47,8 +47,8 @@ tex2lyx_SOURCES = \
text.C text.C
tex2lyx_LDADD = \ tex2lyx_LDADD = \
../support/libsupport.la \ $(top_builddir)/src/support/libsupport.la \
../../boost/libs/regex/src/libboostregex.la -lz $(BOOST_REGEX) -lz
$(BUILT_SOURCES) : $(BUILT_SOURCES) :
@rm -f $@ ; \ @rm -f $@ ; \