most of the 2.X->3.0 commit (up to rev 4299) except for gtk2_ardour/editor_canvas...

[ardour.git] / libs / surfaces / control_protocol / SConscript

diff --git a/libs/surfaces/control_protocol/SConscript b/libs/surfaces/control_protocol/SConscript
index f8a7d574f56622c573b0f57e3fa566890d746414..a9d60c6e2555324cb7faa515fed17a7c88206ef4 100644 (file)
--- a/libs/surfaces/control_protocol/SConscript
+++ b/libs/surfaces/control_protocol/SConscript
@@ -6,7 +6,7 @@ import glob
 
 Import('env final_prefix install_prefix final_config_prefix libraries i18n')
 
-cp = env.Copy()
+cp = env.Clone()
 
 #
 # this defines the version number of libardour_cp
@@ -30,14 +30,16 @@ cp.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
 cp.Append(CXXFLAGS="-DDATA_DIR=\\\""+final_prefix+"/share\\\"")
 cp.Append(CXXFLAGS="-DCONFIG_DIR=\\\""+final_config_prefix+"\\\"")
 cp.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"")
+cp.Append(CPPPATH = libraries['jack'].get('CPPPATH', []))
 
 cp.Merge ([
     libraries['ardour'],
+    libraries['sndfile'],
     libraries['sigc2'],
-    libraries['pbd3'],
+    libraries['pbd'],
     libraries['midi++2'],
+    libraries['evoral'],
     libraries['xml'],
-    libraries['usb'],
     libraries['glib2'],
     libraries['glibmm2']
        ])
@@ -49,7 +51,7 @@ Default(libardour_cp)
 if env['NLS']:
        i18n (cp, cp_files, env)
              
-env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libardour_cp))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libardour_cp))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                     [ 'SConscript' ] +