more compiler warning fixes and a new version number

[ardour.git] / libs / sigc++2 / SConscript

diff --git a/libs/sigc++2/SConscript b/libs/sigc++2/SConscript
index 8934591105617e45121904937f61d376faa035e9..65833dfb530b628f09aec2b371fb4de2421a1f33 100644 (file)
--- a/libs/sigc++2/SConscript
+++ b/libs/sigc++2/SConscript
@@ -1,19 +1,41 @@
 # -*- python -*-
 
-import glob
 import os
+import os.path
+import glob
 
 sigc2_files = glob.glob('sigc++/*.cc') + glob.glob('sigc++/functors/*.cc') + glob.glob('sigc++/adaptors/lambda/*.cc')
 
-Import('env')
+Import('env install_prefix')
 sigc2 = env.Copy()
 
-if os.path.exists ('CVS'):
-    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([sigc_config_h,libsigc])
-else:
-    Default([libsigc])
+libsigc2 = sigc2.SharedLibrary('sigc++2', sigc2_files)
+
+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))
 
-libsigc2 = sigc2.StaticLibrary('sigc++2', sigc2_files)
-Default([sigc2_config_h, libsigc2])
+env.Alias('tarball', env.Distribute (env['DISTTREE'],
+                                     [ 'NEWS', 'README', 'AUTHORS', 'ChangeLog',
+                                       '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') +
+                                     glob.glob('sigc++/adaptors/*.h')
+                                     ))