From 25bdf4c025a8ead65fec62c6a6ca3c01b495ca80 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Wed, 8 Nov 2017 22:19:21 +0100
Subject: [PATCH] Move external plugins install to external file

---
 Makefile                                   | 48 ++++------------------
 source/native-plugins/external/Makefile.mk | 36 ++++++++++++++++
 source/native-plugins/zita-at1.cpp         |  2 +-
 source/native-plugins/zita-bls1.cpp        |  2 +-
 source/native-plugins/zita-rev1.cpp        |  2 +-
 5 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Makefile b/Makefile
index c4c756545..5beafce1a 100644
--- a/Makefile
+++ b/Makefile
@@ -367,7 +367,7 @@ stoat:
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
-install:
+install_main:
 	# Create directories
 	install -d $(DESTDIR)$(BINDIR)
 	install -d $(DESTDIR)$(LIBDIR)/carla/jack
@@ -635,42 +635,6 @@ endif
 
 	# --------------------------------------------------------------------------------------------------------------------
 
-ifeq ($(EXPERIMENTAL_PLUGINS),true)
-	# Install resources (experimental plugins)
-	install -m 644 \
-		bin/resources/at1/*.png \
-		$(DESTDIR)$(DATADIR)/carla/resources/at1
-
-	install -m 644 \
-		bin/resources/bls1/*.png \
-		$(DESTDIR)$(DATADIR)/carla/resources/bls1
-
-	install -m 644 \
-		bin/resources/rev1/*.png \
-		$(DESTDIR)$(DATADIR)/carla/resources/rev1
-
-	install -m 755 \
-		bin/resources/at1-ui \
-		bin/resources/bls1-ui \
-		bin/resources/rev1-ui \
-		$(DESTDIR)$(DATADIR)/carla/resources
-endif
-
-ifeq ($(HAVE_ZYN_DEPS),true)
-ifeq ($(HAVE_ZYN_UI_DEPS),true)
-	# Install resources (zynaddsubfx)
-	install -m 644 \
-		bin/resources/zynaddsubfx/*.png \
-		$(DESTDIR)$(DATADIR)/carla/resources/zynaddsubfx
-
-	install -m 755 \
-		bin/resources/zynaddsubfx-ui \
-		$(DESTDIR)$(DATADIR)/carla/resources
-endif
-endif
-
-	# --------------------------------------------------------------------------------------------------------------------
-
 	# Install lv2 plugin
 	install -d $(DESTDIR)$(LIBDIR)/lv2/carla.lv2
 
@@ -733,6 +697,12 @@ ifneq ($(HAVE_PYQT),true)
 	rm $(DESTDIR)$(LIBDIR)/lv2/carla.lv2/carla-bridge-lv2-modgui
 endif
 
+ifneq ($(EXTERNAL_PLUGINS),true)
+install_external_plugins:
+endif
+
+install: install_main install_external_plugins
+
 # ----------------------------------------------------------------------------------------------------------------------------
 
 uninstall:
@@ -779,7 +749,7 @@ else
 FEV="Qt5"
 endif
 
-features_print:
+features_print_main:
 	@echo "$(tS)---> Main features $(tE)"
 ifeq ($(HAVE_PYQT),true)
 	@echo "Front-End:   $(ANS_YES)(Using $(FEV))"
@@ -959,7 +929,7 @@ ifneq ($(EXTERNAL_PLUGINS),true)
 features_print_external_plugins:
 endif
 
-features: features_print features_print_external_plugins
+features: features_print_main features_print_external_plugins
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
diff --git a/source/native-plugins/external/Makefile.mk b/source/native-plugins/external/Makefile.mk
index adfa1d9b1..fb8894ac5 100644
--- a/source/native-plugins/external/Makefile.mk
+++ b/source/native-plugins/external/Makefile.mk
@@ -190,6 +190,42 @@ endif
 # ---------------------------------------------------------------------------------------------------------------------
 
 all:
+
+install_external_plugins:
+ifeq ($(HAVE_ZYN_DEPS),true)
+ifeq ($(HAVE_ZYN_UI_DEPS),true)
+	# Install resources (zynaddsubfx)
+	install -m 644 \
+		bin/resources/zynaddsubfx/*.png \
+		$(DESTDIR)$(DATADIR)/carla/resources/zynaddsubfx
+
+	install -m 755 \
+		bin/resources/zynaddsubfx-ui \
+		$(DESTDIR)$(DATADIR)/carla/resources
+endif
+endif
+
+ifeq ($(EXPERIMENTAL_PLUGINS),true)
+	# Install resources (experimental plugins)
+	install -m 644 \
+		bin/resources/at1/*.png \
+		$(DESTDIR)$(DATADIR)/carla/resources/at1
+
+	install -m 644 \
+		bin/resources/bls1/*.png \
+		$(DESTDIR)$(DATADIR)/carla/resources/bls1
+
+	install -m 644 \
+		bin/resources/rev1/*.png \
+		$(DESTDIR)$(DATADIR)/carla/resources/rev1
+
+	install -m 755 \
+		bin/resources/zita-at1-ui \
+		bin/resources/zita-bls1-ui \
+		bin/resources/zita-rev1-ui \
+		$(DESTDIR)$(DATADIR)/carla/resources
+endif
+
 features_print_external_plugins:
 ifeq ($(HAVE_DGL),true)
 	@echo "DPF Plugins:     $(ANS_YES)(with UI)"
diff --git a/source/native-plugins/zita-at1.cpp b/source/native-plugins/zita-at1.cpp
index 281125453..429384f3a 100644
--- a/source/native-plugins/zita-at1.cpp
+++ b/source/native-plugins/zita-at1.cpp
@@ -49,7 +49,7 @@ public:
     };
 
     AT1Plugin(const NativeHostDescriptor* const host)
-        : NativePluginAndUiClass(host, "at1-ui"),
+        : NativePluginAndUiClass(host, "zita-at1-ui"),
           fJackClient(),
           jclient(nullptr),
           notemask(0xfff)
diff --git a/source/native-plugins/zita-bls1.cpp b/source/native-plugins/zita-bls1.cpp
index 004c79068..f36dfcf2c 100644
--- a/source/native-plugins/zita-bls1.cpp
+++ b/source/native-plugins/zita-bls1.cpp
@@ -45,7 +45,7 @@ public:
     };
 
     BLS1Plugin(const NativeHostDescriptor* const host)
-        : NativePluginAndUiClass(host, "bls1-ui"),
+        : NativePluginAndUiClass(host, "zita-bls1-ui"),
           fJackClient(),
           jclient(nullptr)
     {
diff --git a/source/native-plugins/zita-rev1.cpp b/source/native-plugins/zita-rev1.cpp
index 8b0bf90d1..20e3ef8bf 100644
--- a/source/native-plugins/zita-rev1.cpp
+++ b/source/native-plugins/zita-rev1.cpp
@@ -45,7 +45,7 @@ public:
     };
 
     REV1Plugin(const NativeHostDescriptor* const host, const bool isAmbisonic)
-        : NativePluginAndUiClass(host, "rev1-ui"),
+        : NativePluginAndUiClass(host, "zita-rev1-ui"),
           kIsAmbisonic(isAmbisonic),
           kNumInputs(2),
           kNumOutputs(isAmbisonic ? 4 : 2),