From 091b9ff7b9315990148dd0a32e309c4059e2fc67 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Mon, 21 Nov 2011 22:24:56 +0000
Subject: tweak wscript files to set PACKAGE in one place

git-svn-id: svn://localhost/ardour2/branches/3.0@10747 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/ardour/wscript    | 2 +-
 libs/gtkmm2ext/wscript | 6 +++---
 libs/pbd/wscript       | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'libs')

diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index bfd9eb8474..9ffed559f1 100644
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -362,7 +362,7 @@ def build(bld):
     obj.vnum         = LIBARDOUR_LIB_VERSION
     obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
     obj.defines      = [
-        'PACKAGE="libardour3"',
+        'PACKAGE="' + I18N_PACKAGE + '"',
         'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
         'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
         'MODULE_DIR="' + os.path.normpath(bld.env['LIBDIR']) + '"',
diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript
index cc3f3de706..e454429fa8 100644
--- a/libs/gtkmm2ext/wscript
+++ b/libs/gtkmm2ext/wscript
@@ -88,9 +88,9 @@ def build(bld):
     obj.use          = 'libpbd'
     obj.vnum         = GTKMM2EXT_LIB_VERSION
     obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
-    obj.cxxflags     = [
-                    '-DPACKAGE="libgtkmm2ext3"',
-                    '-DLOCALEDIR="' + os.path.join(
+    obj.defines     = [
+                    'PACKAGE="' + I18N_PACKAGE + '"',
+                    'LOCALEDIR="' + os.path.join(
                             os.path.normpath(bld.env['DATADIR']), 'locale') + '"']
     if bld.is_defined('GTKOSX'):
         obj.source += ['gtkapplication_quartz.mm']
diff --git a/libs/pbd/wscript b/libs/pbd/wscript
index e0ccb885b1..8afc89ea87 100644
--- a/libs/pbd/wscript
+++ b/libs/pbd/wscript
@@ -19,6 +19,7 @@ LIBPBD_LIB_VERSION = '4.1.0'
 # Variables for 'waf dist'
 APPNAME = 'libpbd'
 VERSION = LIBPBD_VERSION
+I18N_PACKAGE = 'libpbd4'
 
 # Mandatory variables
 top = '.'
@@ -122,10 +123,10 @@ def build(bld):
         obj.uselib += ' OSX'
     obj.vnum         = LIBPBD_LIB_VERSION
     obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
-    obj.cxxflags     = ['-DPACKAGE="libpbd"']
+    obj.defines     = ['PACKAGE="' + I18N_PACKAGE + '"']
 
     if bld.env['build_target'] == 'x86_64':
-        obj.cxxflags += [ '-DUSE_X86_64_ASM' ]
+        obj.defines += [ 'USE_X86_64_ASM' ]
 
     if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):
         # Unit tests
-- 
cgit v1.2.3