diff --git a/libs/glibmm2/SConscript b/libs/glibmm2/SConscript index 42b716c998..99524f2f5a 100644 --- a/libs/glibmm2/SConscript +++ b/libs/glibmm2/SConscript @@ -12,8 +12,20 @@ glibmm2.Append(CXXFLAGS='-DHAVE_CONFIG_H') glibmm2.Append(CXXFLAGS='-DG_DISABLE_DEPRECATED') glibmm2.Append(CXXFLAGS='-DG_LOG_DOMAIN=\\\"glibmm\\\"') -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) - libglibmm2 = glibmm2.StaticLibrary('glibmm2', glibmm2_files) -Default([glibmm2_config_h, libglibmm2]) + +if os.path.exists ('CVS'): + 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) + Default([glibmm2_config_h, libglibmm2]) +else: + Default([libglibmm2]) + + +env.Alias('tarball', env.Distribute (env['DISTTREE'], + [ 'SConscript', 'glibmm.h','glibmmconfig.h'] + + glibmm2_files + + glob.glob('glibmm/*.h') + + glob.glob('glibmm/private/*.h') + )) + diff --git a/libs/gtkmm2/atk/SConscript b/libs/gtkmm2/atk/SConscript index f0f18d4d12..63db8c8ab2 100644 --- a/libs/gtkmm2/atk/SConscript +++ b/libs/gtkmm2/atk/SConscript @@ -8,3 +8,10 @@ atkmm.Merge([libraries['glibmm2'], libraries['gtk2'], libraries['sigc2'] ]) libatkmm = atkmm.StaticLibrary('atkmm', atkmm_files) Default(libatkmm) + +env.Alias('tarball', env.Distribute (env['DISTTREE'], + [ 'SConscript', 'atkmm.h'] + + atkmm_files + + glob.glob('atkmm/*.h') + + glob.glob('atkmm/private/*.h') + )) diff --git a/libs/gtkmm2/gdk/SConscript b/libs/gtkmm2/gdk/SConscript index 05c5288d51..5f76e0c809 100644 --- a/libs/gtkmm2/gdk/SConscript +++ b/libs/gtkmm2/gdk/SConscript @@ -8,3 +8,10 @@ gdkmm2.Merge([libraries['glibmm2'], libraries['gtk2'], libraries['sigc2'], libra libgdkmm2 = gdkmm2.StaticLibrary('gdkmm2', gdkmm2_files) Default(libgdkmm2) + +env.Alias('tarball', env.Distribute (env['DISTTREE'], + [ 'SConscript', 'gdkmmconfig.h', 'gdkmm.h'] + + gdkmm2_files + + glob.glob('gdkmm/*.h') + + glob.glob('gdkmm/private/*.h') + )) diff --git a/libs/gtkmm2/gtk/SConscript b/libs/gtkmm2/gtk/SConscript index ecf8417230..f293f96016 100644 --- a/libs/gtkmm2/gtk/SConscript +++ b/libs/gtkmm2/gtk/SConscript @@ -8,3 +8,10 @@ gtkmm2.Merge([libraries['glibmm2'], libraries['gtk2'], libraries['sigc2'], libra libgtkmm2 = gtkmm2.StaticLibrary('gtkmm2', gtkmm2_files) Default(libgtkmm2) + +env.Alias('tarball', env.Distribute (env['DISTTREE'], + [ 'SConscript', 'gtkmmconfig.h', 'gtkmm.h'] + + gtkmm2_files + + glob.glob('gtkmm/*.h') + + glob.glob('gtkmm/private/*.h') + )) diff --git a/libs/gtkmm2/pango/SConscript b/libs/gtkmm2/pango/SConscript index f869598895..dc7f67cb14 100644 --- a/libs/gtkmm2/pango/SConscript +++ b/libs/gtkmm2/pango/SConscript @@ -9,3 +9,10 @@ pangomm.Merge([libraries['glibmm2'], libraries['pango'], libraries['sigc2']]) libpangomm = pangomm.StaticLibrary('pangomm', pangomm_files) Default(libpangomm) + +env.Alias('tarball', env.Distribute (env['DISTTREE'], + [ 'SConscript', 'pangomm.h'] + + pangomm_files + + glob.glob('pangomm/*.h') + + glob.glob('pangomm/private/*.h') + )) diff --git a/libs/libglademm/SConscript b/libs/libglademm/SConscript index b2a506013d..b71141ccee 100644 --- a/libs/libglademm/SConscript +++ b/libs/libglademm/SConscript @@ -12,3 +12,10 @@ libglademm.Merge([libraries['gtk2'], libraries['glade2'], libraries['sigc2'], li libglade = libglademm.StaticLibrary('libglademm', libglademm_files) Default(libglade) + +env.Alias('tarball', env.Distribute (env['DISTTREE'], + [ 'SConscript', 'libglademmconfig.h', 'libglademm.h'] + + libglademm_files + + glob.glob('libglademm/*.h') + + glob.glob('libglademm/private/*.h') + )) diff --git a/libs/libgnomecanvasmm/SConscript b/libs/libgnomecanvasmm/SConscript index c53d218d94..e49c1d8ef6 100644 --- a/libs/libgnomecanvasmm/SConscript +++ b/libs/libgnomecanvasmm/SConscript @@ -8,3 +8,10 @@ gnomecanvasmm.Merge([libraries['glibmm2'], libraries['gtk2'], libraries['sigc2'] libgnomecanvasmm = gnomecanvasmm.StaticLibrary('libgnomecanvasmm', gnomecanvasmm_files) Default(libgnomecanvasmm) + +env.Alias('tarball', env.Distribute (env['DISTTREE'], + [ 'SConscript', 'libgnomecanvasmmconfig.h', 'libgnomecanvasmm.h'] + + gnomecanvasmm_files + + glob.glob('libgnomecanvasmm/*.h') + + glob.glob('libgnomecanvasmm/private/*.h') + ))