ardour/livetrax
13
0
Fork 0
Code

removed libtool from pre-build process

Browse Source 
git-svn-id: svn://localhost/trunk/ardour2@535 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2006-05-26 12:41:38 +00:00
parent 64f8efdce0
commit 0bde9c1331
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/sigc++2/SConscript
View File

@ -12,8 +12,8 @@ sigc2 = env.Copy()
libsigc2 = sigc2.SharedLibrary('sigc++2', sigc2_files)
if os.path.exists ('CVS') or os.path.exists ('.svn'):
sigc2_configure_script = sigc2.Command ('configure', 'configure.ac', 'cd libs/sigc++2; ./autogen.sh; cd -', ENV=os.environ)
sigc2_config_h = sigc2.Command('sigc++config.h', [sigc2_configure_script, 'sigc++config.h.in'], 'cd libs/sigc++2; ./configure; cd -', ENV=os.environ)
sigc2_configure_script = sigc2.Command ('configure', 'configure.ac', 'cd libs/sigc++2 && ./autogen.sh && cd -', ENV=os.environ)
sigc2_config_h = sigc2.Command('sigc++config.h', [sigc2_configure_script, 'sigc++config.h.in'], 'cd libs/sigc++2 && ./configure && cd -', ENV=os.environ)
Default([sigc2_config_h,libsigc2])
else:
Default([libsigc2])

4
libs/sigc++2/autogen.sh
View File

@ -3,8 +3,8 @@
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
echo "Adding libtools."
libtoolize --automake --copy --force
#echo "Adding libtools."
#libtoolize --automake --copy --force
echo "Building macros."
aclocal -I "$srcdir/scripts" $ACLOCAL_FLAGS

2
libs/sigc++2/configure.ac
View File

@ -36,7 +36,7 @@ AC_PROG_CPP
dnl Using libtool
AC_CONFIG_MACRO_DIR(scripts)
LT_INIT
dnl LT_INIT
dnl AM_PROG_LIBTOOL
dnl Using C++ compiler

7
libs/sigc++2/sigc++/Makefile.am
View File

@ -60,11 +60,12 @@ nobase_library_include_HEADERS = $(sigc_m4) $(sigc_built_h) \
adaptors/lambda/lambda.h
# build the library
lib_LTLIBRARIES = libsigc-2.0.la
libsigc_2_0_la_SOURCES = signal.cc signal_base.cc trackable.cc connection.cc \
#lib_LTLIBRARIES = libsigc-2.0.la
#libsigc_2_0_la_SOURCES = signal.cc signal_base.cc trackable.cc connection.cc \
functors/slot.cc functors/slot_base.cc \
adaptors/lambda/lambda.cc
libsigc_2_0_la_LDFLAGS =
#libsigc_2_0_la_LDFLAGS =
BUILT_SOURCES = $(sigc_built_h) $(sigc_built_cc)
CLEANFILES = build-subdirs-stamp