X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fcontrol_protocol%2FSConscript;h=a9d60c6e2555324cb7faa515fed17a7c88206ef4;hb=bc89fe0147c04b67141936d109c00dfd4d69cc4b;hp=38ff95d9f0da8c4f93d2d64359d48f9e1f5c3c82;hpb=eb3f77df5748e81c4a6bfe737cd9b5a3d721a86c;p=ardour.git

diff --git a/libs/surfaces/control_protocol/SConscript b/libs/surfaces/control_protocol/SConscript
index 38ff95d9f0..a9d60c6e25 100644
--- 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
@@ -23,20 +23,23 @@ cp.Append(POTFILE = domain + '.pot')
 cp_files=Split("""
 basic_ui.cc
 control_protocol.cc
+smpte.cc
 """)
 
 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']
 	])
@@ -48,9 +51,9 @@ 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' ] +
 				     cp_files + 
-				     glob.glob('po/*.po') + glob.glob('*.h')))
+				     glob.glob('po/*.po') + glob.glob('*.h') + glob.glob('control_protocol/*.h')))