fixes for some stupid thinko-crash bugs with automation

[ardour.git] / gtk2_ardour / SConscript

diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
index 02ba7dd9c115c144e8aa6c0d587bdd720d3820d3..fe98307c2db724d9ad237007337dec06c555fb20 100644 (file)
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
@@ -19,6 +19,7 @@ gtkardour.Append(DOMAIN=domain, MAJOR=1,MINOR=0,MICRO=2)
 gtkardour.Append(CCFLAGS="-DPACKAGE=\\\"" + domain + "\\\"")
 gtkardour.Append(CXXFLAGS="-DPACKAGE=\\\"" + domain + "\\\"")
 gtkardour.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
+gtkardour.Append(CPPPATH="#/")  # for top level svn_revision.h
 #gtkardour.Append(CXXFLAGS="-DFLOWCANVAS_AA")
 gtkardour.Append(PACKAGE=domain)
 gtkardour.Append(POTFILE=domain + '.pot')
@@ -34,7 +35,7 @@ gtkardour.Merge ([
     libraries['libgnomecanvas2'],
     libraries['libgnomecanvasmm'],
     libraries['sysmidi'],
-    libraries['sndfile'],
+    libraries['sndfile-ardour'],
     libraries['flac'],
     libraries['lrdf'],
     libraries['glibmm2'],
@@ -305,8 +306,7 @@ env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour2'),
 env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour2/pixmaps'), pixmap_files))
 env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour2/icons'), icon_files))
 
-env.AlwaysBuild ('version.cc')
-env.Alias ('version', gtkardour.VersionBuild(['version.cc','version.h'], ['..']))
+env.Alias ('version', gtkardour.VersionBuild(['version.cc','version.h'], []))
                
 #dist
 env.Alias ('tarball', env.Distribute (env['DISTTREE'],