X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fwscript;h=cddd07b7db71447cce08ca3bf610a4b826b5ca77;hb=92cafb6fc686a041354da2eabde6bcb2f6846e1d;hp=de130ce17fedbde2d89e02387358e3e284575ac8;hpb=7913cba90bccb9501b63a0518c58abbd5a6b330d;p=dcpomatic.git

diff --git a/src/tools/wscript b/src/tools/wscript
index de130ce17..cddd07b7d 100644
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -4,28 +4,29 @@ from waflib import Logs
 import i18n
 
 def build(bld):
-    for t in ['makedcp', 'servomatic_cli', 'servomatictest']:
+    for t in ['dcpomatic_cli', 'dcpomatic_server_cli']:
         obj = bld(features = 'cxx cxxprogram')
-        obj.uselib = 'BOOST_THREAD OPENJPEG DCP AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC'
+        obj.uselib = 'BOOST_THREAD OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC'
         obj.includes = ['..']
-        obj.use    = ['libdvdomatic']
+        obj.use    = ['libdcpomatic']
         obj.source = '%s.cc' % t
         obj.target = t
 
     if not bld.env.DISABLE_GUI:
-        for t in ['dvdomatic', 'servomatic_gui']:
+        for t in ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server']:
             obj = bld(features = 'cxx cxxprogram')
-            obj.uselib = 'DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC'
+            obj.uselib = 'DCP CXML OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC'
             obj.includes = ['..']
-            obj.use    = ['libdvdomatic', 'libdvdomatic-wx']
+            obj.use    = ['libdcpomatic', 'libdcpomatic-wx']
             obj.source = '%s.cc' % t
             if bld.env.TARGET_WINDOWS:
-                obj.source += ' ../../windows/dvdomatic.rc'
+                obj.source += ' ../../windows/dcpomatic.rc'
             obj.target = t
 
-def pot(bld):
-    i18n.pot(os.path.join('src', 'tools'), 'dvdomatic.cc', 'dvdomatic')
+        i18n.po_to_mo(os.path.join('src', 'tools'), 'dcpomatic', bld)
 
-def mo(bld):
-    i18n.po_to_mo(os.path.join('src', 'tools'), 'dvdomatic')
+def pot(bld):
+    i18n.pot(os.path.join('src', 'tools'), 'dcpomatic.cc', 'dcpomatic')
 
+def pot_merge(bld):
+    i18n.pot_merge(os.path.join('src', 'tools'), 'dcpomatic')