diff options
author | David Robillard <d@drobilla.net> | 2006-10-21 19:01:50 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2006-10-21 19:01:50 +0000 |
commit | fedf3d34f32264ac57c6a222b678dc90f2bb1a88 (patch) | |
tree | e816c676d12ccc32b7e666792b9a01ab5b5a0367 /libs/sigc++2/SConscript | |
parent | 7bd41538d951c3e476655df741adfbebbb990bde (diff) |
Merged with trunk R992.
Completely untested other than it compiles, runs, and records somewhat (need to merge again).
git-svn-id: svn://localhost/ardour2/branches/midi@999 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/sigc++2/SConscript')
-rw-r--r-- | libs/sigc++2/SConscript | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/libs/sigc++2/SConscript b/libs/sigc++2/SConscript index 06387b38cf..65833dfb53 100644 --- a/libs/sigc++2/SConscript +++ b/libs/sigc++2/SConscript @@ -11,20 +11,29 @@ sigc2 = env.Copy() libsigc2 = sigc2.SharedLibrary('sigc++2', sigc2_files) -if os.path.exists ('CVS') or os.path.exists ('.svn'): +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) - Default([sigc2_config_h,libsigc2]) -else: - Default([libsigc2]) +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') + |