All included libraries now link dynamically instead of statically.

Moved items from gtk2_ardour/utils to pbd3/convert.
Various cleanups.


git-svn-id: svn://localhost/trunk/ardour2@475 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 files changed, 22 insertions, 5 deletions

diff --git a/libs/gtkmm2/atk/.cvsignore b/libs/gtkmm2/atk/.cvsignore
new file mode 100644
index 0000000000..e5d046710f
--- /dev/null
+++ b/libs/gtkmm2/atk/.cvsignore
@@ -0,0 +1 @@
+*.dylib
diff --git a/libs/gtkmm2/atk/SConscript b/libs/gtkmm2/atk/SConscript
index 63db8c8ab2..25a49c0da6 100644
--- a/libs/gtkmm2/atk/SConscript
+++ b/libs/gtkmm2/atk/SConscript
@@ -1,3 +1,5 @@
+# -*- python -*-
+
 import glob
 
 atkmm_files = glob.glob('atkmm/*.cc')
@@ -6,7 +8,7 @@ Import('env libraries')
 atkmm = env.Copy()
 atkmm.Merge([libraries['glibmm2'], libraries['gtk2'], libraries['sigc2'] ])
 
-libatkmm = atkmm.StaticLibrary('atkmm', atkmm_files)
+libatkmm = atkmm.SharedLibrary('atkmm', atkmm_files)
 Default(libatkmm)
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
diff --git a/libs/gtkmm2/atk/atkmm/.cvsignore b/libs/gtkmm2/atk/atkmm/.cvsignore
new file mode 100644
index 0000000000..1edeb79fd1
--- /dev/null
+++ b/libs/gtkmm2/atk/atkmm/.cvsignore
@@ -0,0 +1 @@
+*.os
diff --git a/libs/gtkmm2/gdk/.cvsignore b/libs/gtkmm2/gdk/.cvsignore
new file mode 100644
index 0000000000..e5d046710f
--- /dev/null
+++ b/libs/gtkmm2/gdk/.cvsignore
@@ -0,0 +1 @@
+*.dylib
diff --git a/libs/gtkmm2/gdk/SConscript b/libs/gtkmm2/gdk/SConscript
index 5f76e0c809..7b10b8d9d8 100644
--- a/libs/gtkmm2/gdk/SConscript
+++ b/libs/gtkmm2/gdk/SConscript
@@ -1,12 +1,15 @@
+# -*- python -*-
+
 import glob
 
 gdkmm2_files = glob.glob('gdkmm/*.cc')
 
 Import('env libraries')
 gdkmm2 = env.Copy()
-gdkmm2.Merge([libraries['glibmm2'], libraries['gtk2'], libraries['sigc2'], libraries['pangomm'], libraries['gtkmm2']])
+gdkmm2.Merge([libraries['glibmm2'], libraries['gtk2'], libraries['sigc2'], libraries['pangomm']])
+gdkmm2.Append(CXXFLAGS="-Ilibs/gtkmm2/gtk")
 
-libgdkmm2 = gdkmm2.StaticLibrary('gdkmm2', gdkmm2_files)
+libgdkmm2 = gdkmm2.SharedLibrary('gdkmm2', gdkmm2_files)
 Default(libgdkmm2)
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
diff --git a/libs/gtkmm2/gdk/gdkmm/.cvsignore b/libs/gtkmm2/gdk/gdkmm/.cvsignore
new file mode 100644
index 0000000000..1edeb79fd1
--- /dev/null
+++ b/libs/gtkmm2/gdk/gdkmm/.cvsignore
@@ -0,0 +1 @@
+*.os
diff --git a/libs/gtkmm2/gtk/.cvsignore b/libs/gtkmm2/gtk/.cvsignore
new file mode 100644
index 0000000000..e5d046710f
--- /dev/null
+++ b/libs/gtkmm2/gtk/.cvsignore
@@ -0,0 +1 @@
+*.dylib
diff --git a/libs/gtkmm2/gtk/SConscript b/libs/gtkmm2/gtk/SConscript
index f293f96016..fcba8eb3fe 100644
--- a/libs/gtkmm2/gtk/SConscript
+++ b/libs/gtkmm2/gtk/SConscript
@@ -1,3 +1,5 @@
+# -*- python -*-
+
 import glob
 
 gtkmm2_files = glob.glob('gtkmm/*.cc')
@@ -6,7 +8,7 @@ Import('env libraries')
 gtkmm2 = env.Copy()
 gtkmm2.Merge([libraries['glibmm2'], libraries['gtk2'], libraries['sigc2'], libraries['pangomm'], libraries['atkmm'], libraries['gdkmm2'] ])
 
-libgtkmm2 = gtkmm2.StaticLibrary('gtkmm2', gtkmm2_files)
+libgtkmm2 = gtkmm2.SharedLibrary('gtkmm2', gtkmm2_files)
 Default(libgtkmm2)
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
diff --git a/libs/gtkmm2/gtk/gtkmm/.cvsignore b/libs/gtkmm2/gtk/gtkmm/.cvsignore
new file mode 100644
index 0000000000..1edeb79fd1
--- /dev/null
+++ b/libs/gtkmm2/gtk/gtkmm/.cvsignore
@@ -0,0 +1 @@
+*.os
diff --git a/libs/gtkmm2/pango/.cvsignore b/libs/gtkmm2/pango/.cvsignore
new file mode 100644
index 0000000000..e5d046710f
--- /dev/null
+++ b/libs/gtkmm2/pango/.cvsignore
@@ -0,0 +1 @@
+*.dylib
diff --git a/libs/gtkmm2/pango/SConscript b/libs/gtkmm2/pango/SConscript
index dc7f67cb14..971c5acd16 100644
--- a/libs/gtkmm2/pango/SConscript
+++ b/libs/gtkmm2/pango/SConscript
@@ -1,3 +1,5 @@
+# -*- python -*-
+
 import glob
 import os
 
@@ -7,7 +9,7 @@ Import('env libraries')
 pangomm = env.Copy()
 pangomm.Merge([libraries['glibmm2'], libraries['pango'], libraries['sigc2']])
 
-libpangomm = pangomm.StaticLibrary('pangomm', pangomm_files)
+libpangomm = pangomm.SharedLibrary('pangomm', pangomm_files)
 Default(libpangomm)
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
diff --git a/libs/gtkmm2/pango/pangomm/.cvsignore b/libs/gtkmm2/pango/pangomm/.cvsignore
new file mode 100644
index 0000000000..1edeb79fd1
--- /dev/null
+++ b/libs/gtkmm2/pango/pangomm/.cvsignore
@@ -0,0 +1 @@
+*.os