diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-05-26 12:41:38 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-05-26 12:41:38 +0000 |
| commit | 0bde9c1331b62da75583328aea797b2ab4fcde09 (patch) | |
| tree | 97992174400bf4ac853ce9471c42877bae31e3d8 /libs | |
| parent | 64f8efdce055f337b06a7bd2f37eca54de6f877b (diff) | |
removed libtool from pre-build process
git-svn-id: svn://localhost/trunk/ardour2@535 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/sigc++2/SConscript | 4 | ||||
| -rwxr-xr-x | libs/sigc++2/autogen.sh | 4 | ||||
| -rw-r--r-- | libs/sigc++2/configure.ac | 2 | ||||
| -rw-r--r-- | libs/sigc++2/sigc++/Makefile.am | 7 |
4 files changed, 9 insertions, 8 deletions
diff --git a/libs/sigc++2/SConscript b/libs/sigc++2/SConscript index 3ad0129653..06387b38cf 100644 --- a/libs/sigc++2/SConscript +++ b/libs/sigc++2/SConscript @@ -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]) diff --git a/libs/sigc++2/autogen.sh b/libs/sigc++2/autogen.sh index c58ddd27a2..ebb519d373 100755 --- a/libs/sigc++2/autogen.sh +++ b/libs/sigc++2/autogen.sh @@ -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 diff --git a/libs/sigc++2/configure.ac b/libs/sigc++2/configure.ac index 14c0ee6a7f..3cb4724ba5 100644 --- a/libs/sigc++2/configure.ac +++ b/libs/sigc++2/configure.ac @@ -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 diff --git a/libs/sigc++2/sigc++/Makefile.am b/libs/sigc++2/sigc++/Makefile.am index 45fe09d0c1..6f9af23e0b 100644 --- a/libs/sigc++2/sigc++/Makefile.am +++ b/libs/sigc++2/sigc++/Makefile.am @@ -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 |