merge from 2.0-ongoing @ 3581

[ardour.git] / libs / cairomm / SConscript

diff --git a/libs/cairomm/SConscript b/libs/cairomm/SConscript
index 88b8b2ab067b1742bada3afae0e01612cb3184c1..cb3dfa9c1a45ec395cfe9f6195cb756453dd084c 100644 (file)
--- a/libs/cairomm/SConscript
+++ b/libs/cairomm/SConscript
@@ -7,16 +7,27 @@ import glob
 cairomm_files = glob.glob('cairomm/*.cc')
 
 Import('env libraries install_prefix')
-cairomm = env.Copy()
+
+cairomm = env.Clone()
 cairomm.Merge([libraries['cairo']])
 
+cairomm.Append(CXXFLAGS='-DHAVE_CONFIG_H')
+
 libcairomm = cairomm.SharedLibrary('cairomm', cairomm_files)
-Default(libcairomm)
 
-env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libcairomm))
+Default([libcairomm])
+
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libcairomm))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
-                                     [ 'SConscript'] + 
+                                     [ 'SConscript',
+                                       'cairomm/cairomm.h',
+                                       'configure',
+                                       'Makefile.in',
+                                       'cairomm/cairomm-1.0.pc.in',
+                                       'cairomm/Makefile.in'
+                                       ] +
                                     cairomm_files + 
-                                    glob.glob('cairomm/*.h') 
+                                    glob.glob('cairomm/*.h')
                                     ))
+