From a0916ef3681ca548c83b05960ad4e773fdf3bb13 Mon Sep 17 00:00:00 2001
From: Mads Kiilerich <mads@kiilerich.com>
Date: Sat, 9 Apr 2022 16:19:05 +0200
Subject: [PATCH] wscript: drop unused APPNAME assignment in libs

https://waf.io/book/ says
  By default, the project name and version are set to noname and 1.0. To
  change them, it is necessary to provide two additional variables in
  the top-level project file

- and waf code inspection confirms that waf itself only will use the top
level APPNAME.

Also, the 'waf dist' comment doesn't seem relevant - especially after
this change - and is removed too.

(Note: libs/evoral/wscript and libs/temporal/wscript still use APPNAME
for other purposes.)
---
 libs/audiographer/wscript   | 3 ---
 libs/canvas/wscript         | 2 --
 libs/evoral/wscript         | 1 -
 libs/fluidsynth/wscript     | 2 --
 libs/gtkmm2ext/wscript      | 2 --
 libs/hidapi/wscript         | 3 ---
 libs/libltc/wscript         | 2 --
 libs/lua/wscript            | 2 --
 libs/midi++2/wscript        | 3 ---
 libs/pbd/wscript            | 2 --
 libs/ptformat/wscript       | 2 --
 libs/qm-dsp/wscript         | 3 ---
 libs/surfaces/wscript       | 3 ---
 libs/temporal/wscript       | 1 -
 libs/vamp-pyin/wscript      | 3 ---
 libs/waveview/wscript       | 2 --
 libs/widgets/wscript        | 2 --
 libs/zita-convolver/wscript | 2 --
 libs/zita-resampler/wscript | 2 --
 19 files changed, 42 deletions(-)

diff --git a/libs/audiographer/wscript b/libs/audiographer/wscript
index bf8e1fc1d5..3c63e7fff0 100644
--- a/libs/audiographer/wscript
+++ b/libs/audiographer/wscript
@@ -13,9 +13,6 @@ AUDIOGRAPHER_VERSION = '0.0.0'
 #   0.0.0 = 0,0,0
 AUDIOGRAPHER_LIB_VERSION = '0.0.0'
 
-# Variables for 'waf dist'
-APPNAME = 'audiographer'
-
 # Mandatory variables
 top = '.'
 out = 'build'
diff --git a/libs/canvas/wscript b/libs/canvas/wscript
index ec6c83c63b..b705fcd8fd 100644
--- a/libs/canvas/wscript
+++ b/libs/canvas/wscript
@@ -14,8 +14,6 @@ CANVAS_VERSION = "%s.%s.%s" % (MAJOR, MINOR, MICRO)
 # micro increment <=> no interface changes
 CANVAS_LIB_VERSION = '0.0.0'
 
-# Variables for 'waf dist'
-APPNAME = 'canvas'
 I18N_PACKAGE = 'libcanvas'
 
 # Mandatory variables
diff --git a/libs/evoral/wscript b/libs/evoral/wscript
index b77c72df2b..7792d3d8ab 100644
--- a/libs/evoral/wscript
+++ b/libs/evoral/wscript
@@ -14,7 +14,6 @@ EVORAL_VERSION = '0.0.0'
 #   0.0.0 = 0,0,0
 EVORAL_LIB_VERSION = '0.0.0'
 
-# Variables for 'waf dist'
 APPNAME = 'evoral'
 
 # Mandatory variables
diff --git a/libs/fluidsynth/wscript b/libs/fluidsynth/wscript
index e160bf063e..498166531d 100644
--- a/libs/fluidsynth/wscript
+++ b/libs/fluidsynth/wscript
@@ -7,8 +7,6 @@ MINOR = '0'
 MICRO = '1'
 LIBFLUIDSYNTH_VERSION = "%s.%s.%s" % (MAJOR, MINOR, MICRO)
 
-# Variables for 'waf dist'
-APPNAME = 'libltc'
 I18N_PACKAGE = 'libfluidsynth'
 
 # Mandatory variables
diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript
index 70dc6c831e..ca698c63f4 100644
--- a/libs/gtkmm2ext/wscript
+++ b/libs/gtkmm2ext/wscript
@@ -15,8 +15,6 @@ GTKMM2EXT_VERSION = "%s.%s.%s" % (MAJOR, MINOR, MICRO)
 # micro increment <=> no interface changes
 GTKMM2EXT_LIB_VERSION = '0.8.3'
 
-# Variables for 'waf dist'
-APPNAME = 'gtkmm2ext'
 I18N_PACKAGE = 'gtkmm2ext3'
 
 gtkmm2ext_sources = [
diff --git a/libs/hidapi/wscript b/libs/hidapi/wscript
index 0b969a8cd8..60089c769a 100644
--- a/libs/hidapi/wscript
+++ b/libs/hidapi/wscript
@@ -5,9 +5,6 @@ import sys
 
 HIDAPI_VERSION = '0.8.0'
 
-# Variables for 'waf dist'
-APPNAME = 'hidapi'
-
 # Mandatory variables
 top = '.'
 out = 'build'
diff --git a/libs/libltc/wscript b/libs/libltc/wscript
index 221bab7c11..7a4b60ceff 100644
--- a/libs/libltc/wscript
+++ b/libs/libltc/wscript
@@ -13,8 +13,6 @@ LIBLTC_VERSION = "%s.%s.%s" % (MAJOR, MINOR, MICRO)
 # micro increment <=> no interface changes
 LIBLTC_LIB_VERSION = '1.1.1'
 
-# Variables for 'waf dist'
-APPNAME = 'libltc'
 I18N_PACKAGE = 'libltc'
 
 # Mandatory variables
diff --git a/libs/lua/wscript b/libs/lua/wscript
index d113b3d0ec..6e54739b6f 100644
--- a/libs/lua/wscript
+++ b/libs/lua/wscript
@@ -1,8 +1,6 @@
 #!/usr/bin/env python
 from waflib.extras import autowaf as autowaf
 
-# Variables for 'waf dist'
-APPNAME = 'liblua'
 I18N_PACKAGE = 'liblua'
 
 # Mandatory variables
diff --git a/libs/midi++2/wscript b/libs/midi++2/wscript
index b60f1f1fda..8f661b9161 100644
--- a/libs/midi++2/wscript
+++ b/libs/midi++2/wscript
@@ -13,9 +13,6 @@ LIBMIDIPP_VERSION = "%s.%s.%s" % (MAJOR, MINOR, MICRO)
 # micro increment <=> no interface changes
 LIBMIDIPP_LIB_VERSION = '4.1.0'
 
-# Variables for 'waf dist'
-APPNAME = 'libmidipp'
-
 # Mandatory variables
 top = '.'
 out = 'build'
diff --git a/libs/pbd/wscript b/libs/pbd/wscript
index c4dcb5d5d8..f3955eaad2 100644
--- a/libs/pbd/wscript
+++ b/libs/pbd/wscript
@@ -17,8 +17,6 @@ LIBPBD_VERSION = "%s.%s.%s" % (MAJOR, MINOR, MICRO)
 LIBPBD_LIB_VERSION = '4.1.0'
 LIBPBD_MAJOR_VERSION = '4'
 
-# Variables for 'waf dist'
-APPNAME = 'libpbd'
 I18N_PACKAGE = 'libpbd4'
 
 # Mandatory variables
diff --git a/libs/ptformat/wscript b/libs/ptformat/wscript
index ccf50e5208..b71a237aec 100644
--- a/libs/ptformat/wscript
+++ b/libs/ptformat/wscript
@@ -10,8 +10,6 @@ LIBPTFORMAT_VERSION = '0.0.0'
 # micro increment <=> no interface changes
 LIBPTFORMAT_LIB_VERSION = '0.0.0'
 
-# Variables for 'waf dist'
-APPNAME = 'libptformat'
 I18N_PACKAGE = 'libptformat'
 
 # Mandatory variables
diff --git a/libs/qm-dsp/wscript b/libs/qm-dsp/wscript
index 185bc09eac..6faf79af10 100644
--- a/libs/qm-dsp/wscript
+++ b/libs/qm-dsp/wscript
@@ -10,9 +10,6 @@ QM_DSP_VERSION = '1.7.1'
 # micro increment <=> no interface changes
 QM_DSP_LIB_VERSION = '1.7.1'
 
-# Variables for 'waf dist'
-APPNAME = 'qm-dsp'
-
 # Mandatory variables
 top = '.'
 out = 'build'
diff --git a/libs/surfaces/wscript b/libs/surfaces/wscript
index 7e3b335e76..75c4d7c55d 100644
--- a/libs/surfaces/wscript
+++ b/libs/surfaces/wscript
@@ -11,9 +11,6 @@ LIBSURFACES_VERSION = '4.1.0'
 # micro increment <=> no interface changes
 LIBSURFACES_LIB_VERSION = '4.1.0'
 
-# Variables for 'waf dist'
-APPNAME = 'libsurfaces'
-
 # Mandatory variables
 top = '.'
 out = 'build'
diff --git a/libs/temporal/wscript b/libs/temporal/wscript
index 74e2fab6df..821fccec85 100644
--- a/libs/temporal/wscript
+++ b/libs/temporal/wscript
@@ -18,7 +18,6 @@ TEMPORAL_VERSION = "%s.%s.%s" % (MAJOR, MINOR, MICRO)
 # micro increment <=> no interface changes
 TEMPORAL_LIB_VERSION = '0.0.0'
 
-# Variables for 'waf dist'
 APPNAME = 'temporal'
 I18N_PACKAGE = 'libtemporal'
 
diff --git a/libs/vamp-pyin/wscript b/libs/vamp-pyin/wscript
index ded61b745f..019267e4c2 100644
--- a/libs/vamp-pyin/wscript
+++ b/libs/vamp-pyin/wscript
@@ -8,9 +8,6 @@ import os
 # micro increment <=> no interface changes
 VAMP_PYIN_LIB_VERSION = '0.0.0'
 
-# Variables for 'waf dist'
-APPNAME = 'libardourvamppyin'
-
 # Mandatory variables
 top = '.'
 out = 'build'
diff --git a/libs/waveview/wscript b/libs/waveview/wscript
index 4649d2c65e..7cf2303050 100644
--- a/libs/waveview/wscript
+++ b/libs/waveview/wscript
@@ -13,8 +13,6 @@ WAVEVIEW_VERSION = "%s.%s.%s" % (MAJOR, MINOR, MICRO)
 # micro increment <=> no interface changes
 WAVEVIEW_LIB_VERSION = '0.0.0'
 
-# Variables for 'waf dist'
-APPNAME = 'waveview'
 I18N_PACKAGE = 'libwaveview'
 
 # Mandatory variables
diff --git a/libs/widgets/wscript b/libs/widgets/wscript
index e85706136c..5ac5bbac92 100644
--- a/libs/widgets/wscript
+++ b/libs/widgets/wscript
@@ -13,8 +13,6 @@ WIDGETS_VERSION = "%s.%s.%s" % (MAJOR, MINOR, MICRO)
 # micro increment <=> no interface changes
 WIDGETS_LIB_VERSION = '0.0.0'
 
-# Variables for 'waf dist'
-APPNAME = 'widgets'
 I18N_PACKAGE = 'libwidgets'
 
 # Mandatory variables
diff --git a/libs/zita-convolver/wscript b/libs/zita-convolver/wscript
index d1445a944c..3046ae04ad 100644
--- a/libs/zita-convolver/wscript
+++ b/libs/zita-convolver/wscript
@@ -13,8 +13,6 @@ ZCONVOLVER_VERSION = "%s.%s.%s" % (MAJOR, MINOR, MICRO)
 # micro increment <=> no interface changes
 ZCONVOLVER_LIB_VERSION = '4.0.0'
 
-# Variables for 'waf dist'
-APPNAME = 'zita-convolver'
 I18N_PACKAGE = 'libzita-convolver'
 
 # Mandatory variables
diff --git a/libs/zita-resampler/wscript b/libs/zita-resampler/wscript
index 4c934d5912..980f0a241d 100644
--- a/libs/zita-resampler/wscript
+++ b/libs/zita-resampler/wscript
@@ -13,8 +13,6 @@ ZRESAMPLER_VERSION = "%s.%s.%s" % (MAJOR, MINOR, MICRO)
 # micro increment <=> no interface changes
 ZRESAMPLER_LIB_VERSION = '1.6.0'
 
-# Variables for 'waf dist'
-APPNAME = 'zita-resampler'
 I18N_PACKAGE = 'libzita-resampler'
 
 # Mandatory variables