changes to make the tarball compile

git-svn-id: svn://localhost/ardour2/trunk@939 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2006-10-02 20:29:57 +00:00
parent 02115563fe
commit c0fa196073
4 changed files with 44 additions and 9 deletions

View file

@ -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')))

View file

@ -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')

View file

@ -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' ]
))

View file

@ -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') +