From c0fa196073f21587129aaf7e8305bbbb8f1ec5ca Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 2 Oct 2006 20:29:57 +0000 Subject: changes to make the tarball compile git-svn-id: svn://localhost/ardour2/trunk@939 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/SConscript | 2 +- libs/glibmm2/SConscript | 21 ++++++++++++++++++--- libs/libsndfile/SConscript | 10 +++++++++- libs/sigc++2/SConscript | 20 ++++++++++++++++---- 4 files changed, 44 insertions(+), 9 deletions(-) diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript index 19a15811f1..054b251ae7 100644 --- a/libs/ardour/SConscript +++ b/libs/ardour/SConscript @@ -280,5 +280,5 @@ env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), li env.Alias('tarball', env.Distribute (env['DISTTREE'], [ 'SConscript', 'i18n.h', 'gettext.h', 'sse_functions.s', 'sse_functions_64bit.s' ] + - ardour_files + vst_files + coreaudio_files + audiounit_files + + ardour_files + osc_files + vst_files + coreaudio_files + audiounit_files + glob.glob('po/*.po') + glob.glob('ardour/*.h'))) diff --git a/libs/glibmm2/SConscript b/libs/glibmm2/SConscript index 63dc384e3f..dbc58e6499 100644 --- a/libs/glibmm2/SConscript +++ b/libs/glibmm2/SConscript @@ -18,14 +18,29 @@ glibmm2.Append(CXXFLAGS='-DG_LOG_DOMAIN=\\\"glibmm\\\"') libglibmm2 = glibmm2.SharedLibrary('glibmm2', glibmm2_files) -glibmm2_configure_script = glibmm2.Command ('configure', 'configure.ac', 'cd libs/glibmm2; ./autogen.sh; cd -', ENV=os.environ) -glibmm2_config_h = glibmm2.Command('glibmmconfig.h', [glibmm2_configure_script, 'glibmmconfig.h.in'], 'cd libs/glibmm2; ./configure; cd -', ENV=os.environ) +if os.access ('autogen.sh', os.F_OK) : + glibmm2_configure_script = glibmm2.Command ('configure', 'configure.ac', 'cd libs/glibmm2; ./autogen.sh; cd -', ENV=os.environ) + glibmm2_config_h = glibmm2.Command('glibmmconfig.h', [glibmm2_configure_script, 'glibmmconfig.h.in'], + 'cd libs/glibmm2; ./configure || exit 1; cd -', ENV=os.environ) +else : + glibmm2_config_h = glibmm2.Command('glibmmconfig.h', ['configure', 'glibmmconfig.h.in'], + 'cd libs/glibmm2; ./configure || exit 1; cd -', ENV=os.environ) + Default([glibmm2_config_h, libglibmm2]) env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libglibmm2)) env.Alias('tarball', env.Distribute (env['DISTTREE'], - [ 'SConscript', 'glibmm.h','glibmmconfig.h'] + + [ 'SConscript', + 'glibmm.h', + 'configure', + 'Makefile.in', + 'glibmmconfig.h', + 'glibmmconfig.h.in', + 'glibmm-2.4.pc.in', + 'glibmm/Makefile.in', + 'scripts' + ] + glibmm2_files + glob.glob('glibmm/*.h') + glob.glob('glibmm/private/*.h') diff --git a/libs/libsndfile/SConscript b/libs/libsndfile/SConscript index b7d35b9337..b1c29e5487 100644 --- a/libs/libsndfile/SConscript +++ b/libs/libsndfile/SConscript @@ -35,9 +35,17 @@ env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), li env.Alias('tarball', env.Distribute (env['DISTTREE'], [ 'NEWS', 'README', 'AUTHORS', 'ChangeLog', - 'configure', 'SConscript',] + + 'configure', 'SConscript', + 'install-sh', + 'libsndfile.spec.in', + 'sndfile.pc.in', + 'config.sub', + 'config.guess' + ] + sndfile_files + glob.glob('src/*.h') + + glob.glob('src/GSM610/*.h') + + glob.glob('src/G72x/*.h') + [ 'src/sndfile.h.in', 'src/config.h.in', 'src/Symbols.linux', 'src/Symbols.darwin', 'src/libsndfile.def', 'src/cygsndfile.def' ] )) diff --git a/libs/sigc++2/SConscript b/libs/sigc++2/SConscript index f0bf07ca79..65833dfb53 100644 --- a/libs/sigc++2/SConscript +++ b/libs/sigc++2/SConscript @@ -11,17 +11,29 @@ sigc2 = env.Copy() libsigc2 = sigc2.SharedLibrary('sigc++2', sigc2_files) -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) +if os.access ('autogen.sh', os.F_OK) : + 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) +else : + sigc2_config_h = sigc2.Command('sigc++config.h', ['configure', 'sigc++config.h.in'], 'cd libs/sigc++2 && ./configure && cd -', ENV=os.environ) + + Default([sigc2_config_h,libsigc2]) env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libsigc2)) env.Alias('tarball', env.Distribute (env['DISTTREE'], [ 'NEWS', 'README', 'AUTHORS', 'ChangeLog', - 'configure', 'Makefile.am', 'SConscript', - 'sigc++/Makefile.am', + 'configure', 'configure.ac', 'Makefile.am', 'SConscript', + 'sigc++/Makefile.in', 'sigc++config.h', + 'sigc++config.h.in', + 'sigc++-2.0.pc.in', + 'libsigc++-2.0.spec.in', + 'install-sh', + 'Makefile.in', + 'scripts', + 'missing', ] + sigc2_files + glob.glob('sigc++/*.h') + glob.glob('sigc++/functors/*.h') + glob.glob('sigc++/adaptors/lambda/*.h') + -- cgit v1.2.3