Merged with trunk (painfully)

git-svn-id: svn://localhost/ardour2/branches/midi@581 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2006-06-13 07:27:52 +00:00
parent edc7a146f5
commit 868f557f26
127 changed files with 1758 additions and 1195 deletions

View file

@ -36,7 +36,9 @@ cp.Merge ([
libraries['pbd3'],
libraries['midi++2'],
libraries['xml'],
libraries['usb']
libraries['usb'],
libraries['glib2'],
libraries['glibmm2']
])
libardour_cp = cp.SharedLibrary('ardour_cp', cp_files)
@ -49,6 +51,6 @@ if env['NLS']:
env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libardour_cp))
env.Alias('tarball', env.Distribute (env['DISTTREE'],
[ 'SConscript', 'i18n.h', 'gettext.h' ] +
[ 'SConscript' ] +
cp_files +
glob.glob('po/*.po') + glob.glob('*.h')))