From 85d6923d9100ecec11841a8b6431d0914f81c1a7 Mon Sep 17 00:00:00 2001 From: falkTX Date: Fri, 30 Oct 2015 10:37:42 +0100 Subject: Don't build UI if OBJS_UI isn't defined This removes the need for TARGET_NOUI --- plugins/Makefile.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/Makefile.mk b/plugins/Makefile.mk index dcfe8ec..28b5645 100644 --- a/plugins/Makefile.mk +++ b/plugins/Makefile.mk @@ -8,6 +8,10 @@ include ../../Makefile.mk +ifeq ($(OBJS_UI),) +HAVE_DGL = false +endif + # -------------------------------------------------------------- # Basic setup @@ -52,7 +56,6 @@ endif # -------------------------------------------------------------- # Handle plugins without UI -ifeq ($(TARGET_NOUI),true) ifneq ($(HAVE_DGL),true) dssi_ui = lv2_ui = @@ -60,7 +63,6 @@ DISTRHO_UI_FILES = DGL_LIBS = OBJS_UI = endif -endif # -------------------------------------------------------------- # all needs to be first -- cgit v1.2.3 From 5fc6ef16738827977b481bade77720f9048a8ff0 Mon Sep 17 00:00:00 2001 From: falkTX Date: Fri, 30 Oct 2015 10:40:14 +0100 Subject: JACK standalones can now be built without UI in DPF This is useful for headless setups --- plugins/ZaMaximX2/Makefile | 2 -- plugins/ZaMultiComp/Makefile | 2 -- plugins/ZaMultiCompX2/Makefile | 2 -- plugins/ZamAutoSat/Makefile | 2 -- plugins/ZamChild670/Makefile | 2 -- plugins/ZamComp/Makefile | 2 -- plugins/ZamCompX2/Makefile | 2 -- plugins/ZamEQ2/Makefile | 2 -- plugins/ZamGEQ31/Makefile | 2 -- plugins/ZamGate/Makefile | 2 -- plugins/ZamGateX2/Makefile | 2 -- plugins/ZamHeadX2/Makefile | 2 -- plugins/ZamNoise/Makefile | 2 -- plugins/ZamPiano/Makefile | 2 -- plugins/ZamSFZ/Makefile | 2 -- plugins/ZamSynth/Makefile | 2 -- plugins/ZamTube/Makefile | 2 -- 17 files changed, 34 deletions(-) diff --git a/plugins/ZaMaximX2/Makefile b/plugins/ZaMaximX2/Makefile index 99e2992..91f249c 100644 --- a/plugins/ZaMaximX2/Makefile +++ b/plugins/ZaMaximX2/Makefile @@ -27,11 +27,9 @@ include ../Makefile.mk # -------------------------------------------------------------- # Enable all possible plugin types -ifeq ($(HAVE_DGL),true) ifeq ($(HAVE_JACK),true) TARGETS += jack endif -endif ifeq ($(LINUX),true) TARGETS += ladspa diff --git a/plugins/ZaMultiComp/Makefile b/plugins/ZaMultiComp/Makefile index 67956bd..cee399e 100644 --- a/plugins/ZaMultiComp/Makefile +++ b/plugins/ZaMultiComp/Makefile @@ -27,11 +27,9 @@ include ../Makefile.mk # -------------------------------------------------------------- # Enable all possible plugin types -ifeq ($(HAVE_DGL),true) ifeq ($(HAVE_JACK),true) TARGETS += jack endif -endif ifeq ($(LINUX),true) TARGETS += ladspa diff --git a/plugins/ZaMultiCompX2/Makefile b/plugins/ZaMultiCompX2/Makefile index ab019d4..c2ca66c 100644 --- a/plugins/ZaMultiCompX2/Makefile +++ b/plugins/ZaMultiCompX2/Makefile @@ -27,11 +27,9 @@ include ../Makefile.mk # -------------------------------------------------------------- # Enable all possible plugin types -ifeq ($(HAVE_DGL),true) ifeq ($(HAVE_JACK),true) TARGETS += jack endif -endif ifeq ($(LINUX),true) TARGETS += ladspa diff --git a/plugins/ZamAutoSat/Makefile b/plugins/ZamAutoSat/Makefile index b73f088..63027aa 100644 --- a/plugins/ZamAutoSat/Makefile +++ b/plugins/ZamAutoSat/Makefile @@ -27,11 +27,9 @@ include ../Makefile.mk # -------------------------------------------------------------- # Enable all possible plugin types -ifeq ($(HAVE_DGL),true) ifeq ($(HAVE_JACK),true) TARGETS += jack endif -endif ifeq ($(LINUX),true) TARGETS += ladspa diff --git a/plugins/ZamChild670/Makefile b/plugins/ZamChild670/Makefile index a5ade5d..6cd1d3c 100644 --- a/plugins/ZamChild670/Makefile +++ b/plugins/ZamChild670/Makefile @@ -32,11 +32,9 @@ include ../Makefile.mk # -------------------------------------------------------------- # Enable all possible plugin types -ifeq ($(HAVE_DGL),true) ifeq ($(HAVE_JACK),true) TARGETS += jack endif -endif ifeq ($(LINUX),true) TARGETS += ladspa diff --git a/plugins/ZamComp/Makefile b/plugins/ZamComp/Makefile index 9e756a4..06806b4 100644 --- a/plugins/ZamComp/Makefile +++ b/plugins/ZamComp/Makefile @@ -27,11 +27,9 @@ include ../Makefile.mk # -------------------------------------------------------------- # Enable all possible plugin types -ifeq ($(HAVE_DGL),true) ifeq ($(HAVE_JACK),true) TARGETS += jack endif -endif ifeq ($(LINUX),true) TARGETS += ladspa diff --git a/plugins/ZamCompX2/Makefile b/plugins/ZamCompX2/Makefile index 229b1e9..8378bd0 100644 --- a/plugins/ZamCompX2/Makefile +++ b/plugins/ZamCompX2/Makefile @@ -27,11 +27,9 @@ include ../Makefile.mk # -------------------------------------------------------------- # Enable all possible plugin types -ifeq ($(HAVE_DGL),true) ifeq ($(HAVE_JACK),true) TARGETS += jack endif -endif ifeq ($(LINUX),true) TARGETS += ladspa diff --git a/plugins/ZamEQ2/Makefile b/plugins/ZamEQ2/Makefile index e951524..4f7551c 100644 --- a/plugins/ZamEQ2/Makefile +++ b/plugins/ZamEQ2/Makefile @@ -27,11 +27,9 @@ include ../Makefile.mk # -------------------------------------------------------------- # Enable all possible plugin types -ifeq ($(HAVE_DGL),true) ifeq ($(HAVE_JACK),true) TARGETS += jack endif -endif ifeq ($(LINUX),true) TARGETS += ladspa diff --git a/plugins/ZamGEQ31/Makefile b/plugins/ZamGEQ31/Makefile index 97864db..7279ee4 100644 --- a/plugins/ZamGEQ31/Makefile +++ b/plugins/ZamGEQ31/Makefile @@ -27,11 +27,9 @@ include ../Makefile.mk # -------------------------------------------------------------- # Enable all possible plugin types -ifeq ($(HAVE_DGL),true) ifeq ($(HAVE_JACK),true) TARGETS += jack endif -endif ifeq ($(LINUX),true) TARGETS += ladspa diff --git a/plugins/ZamGate/Makefile b/plugins/ZamGate/Makefile index 96d1b31..98189f1 100644 --- a/plugins/ZamGate/Makefile +++ b/plugins/ZamGate/Makefile @@ -27,11 +27,9 @@ include ../Makefile.mk # -------------------------------------------------------------- # Enable all possible plugin types -ifeq ($(HAVE_DGL),true) ifeq ($(HAVE_JACK),true) TARGETS += jack endif -endif ifeq ($(LINUX),true) TARGETS += ladspa diff --git a/plugins/ZamGateX2/Makefile b/plugins/ZamGateX2/Makefile index 479f1d4..03029b0 100644 --- a/plugins/ZamGateX2/Makefile +++ b/plugins/ZamGateX2/Makefile @@ -27,11 +27,9 @@ include ../Makefile.mk # -------------------------------------------------------------- # Enable all possible plugin types -ifeq ($(HAVE_DGL),true) ifeq ($(HAVE_JACK),true) TARGETS += jack endif -endif ifeq ($(LINUX),true) TARGETS += ladspa diff --git a/plugins/ZamHeadX2/Makefile b/plugins/ZamHeadX2/Makefile index d1bb256..4e919ab 100644 --- a/plugins/ZamHeadX2/Makefile +++ b/plugins/ZamHeadX2/Makefile @@ -27,11 +27,9 @@ include ../Makefile.mk # -------------------------------------------------------------- # Enable all possible plugin types -ifeq ($(HAVE_DGL),true) ifeq ($(HAVE_JACK),true) TARGETS += jack endif -endif ifeq ($(LINUX),true) TARGETS += ladspa diff --git a/plugins/ZamNoise/Makefile b/plugins/ZamNoise/Makefile index 3ea904e..cc26e0f 100644 --- a/plugins/ZamNoise/Makefile +++ b/plugins/ZamNoise/Makefile @@ -28,11 +28,9 @@ include ../Makefile.mk # -------------------------------------------------------------- # Enable all possible plugin types -ifeq ($(HAVE_DGL),true) ifeq ($(HAVE_JACK),true) TARGETS += jack endif -endif ifeq ($(LINUX),true) TARGETS += ladspa diff --git a/plugins/ZamPiano/Makefile b/plugins/ZamPiano/Makefile index 24543c9..f4b5ca3 100644 --- a/plugins/ZamPiano/Makefile +++ b/plugins/ZamPiano/Makefile @@ -29,11 +29,9 @@ include ../Makefile.mk # -------------------------------------------------------------- # Enable all possible plugin types -ifeq ($(HAVE_DGL),true) ifeq ($(HAVE_JACK),true) TARGETS += jack endif -endif ifeq ($(LINUX),true) TARGETS += dssi_dsp diff --git a/plugins/ZamSFZ/Makefile b/plugins/ZamSFZ/Makefile index 1398b0f..a03419d 100644 --- a/plugins/ZamSFZ/Makefile +++ b/plugins/ZamSFZ/Makefile @@ -35,11 +35,9 @@ LINK_FLAGS += $(shell pkg-config --libs sndfile rubberband) # -------------------------------------------------------------- # Enable all possible plugin types -ifeq ($(HAVE_DGL),true) ifeq ($(HAVE_JACK),true) TARGETS += jack endif -endif ifeq ($(LINUX),true) TARGETS += dssi_dsp diff --git a/plugins/ZamSynth/Makefile b/plugins/ZamSynth/Makefile index cd68dd2..c1c7103 100644 --- a/plugins/ZamSynth/Makefile +++ b/plugins/ZamSynth/Makefile @@ -27,11 +27,9 @@ include ../Makefile.mk # -------------------------------------------------------------- # Enable all possible plugin types -ifeq ($(HAVE_DGL),true) ifeq ($(HAVE_JACK),true) TARGETS += jack endif -endif ifeq ($(LINUX),true) TARGETS += dssi_dsp diff --git a/plugins/ZamTube/Makefile b/plugins/ZamTube/Makefile index 0925dac..71ae929 100644 --- a/plugins/ZamTube/Makefile +++ b/plugins/ZamTube/Makefile @@ -28,11 +28,9 @@ include ../Makefile.mk # -------------------------------------------------------------- # Enable all possible plugin types -ifeq ($(HAVE_DGL),true) ifeq ($(HAVE_JACK),true) TARGETS += jack endif -endif ifeq ($(LINUX),true) TARGETS += ladspa -- cgit v1.2.3 From 2b27e86b5225757f02c76718f9583bd11a9d1f97 Mon Sep 17 00:00:00 2001 From: falkTX Date: Fri, 30 Oct 2015 10:57:21 +0100 Subject: Don't install jack standalones if jack is not available --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index cfd0c4a..2b4cd8a 100644 --- a/Makefile +++ b/Makefile @@ -42,8 +42,12 @@ install: all install -d $(DESTDIR)$(PREFIX)/$(LIBDIR)/lv2/"$$plugin".lv2 ; \ install -t $(DESTDIR)$(PREFIX)/$(LIBDIR)/lv2/"$$plugin".lv2 \ bin/"$$plugin".lv2/* ; \ + done; \ +ifeq ($(HAVE_JACK),true) + for plugin in $(PLUGINS); do \ install -t $(DESTDIR)$(PREFIX)/$(BINDIR) bin/"$$plugin" ; \ done; \ +endif install -t $(DESTDIR)$(PREFIX)/$(LIBDIR)/ladspa bin/*-ladspa.so install -t $(DESTDIR)$(PREFIX)/$(LIBDIR)/vst bin/*-vst.so -- cgit v1.2.3 From d1ac4b5f0ef7ce89d76f1361c7ca6d162fd5c930 Mon Sep 17 00:00:00 2001 From: falkTX Date: Fri, 30 Oct 2015 10:59:41 +0100 Subject: Fix last commit --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2b4cd8a..fee069a 100644 --- a/Makefile +++ b/Makefile @@ -42,11 +42,11 @@ install: all install -d $(DESTDIR)$(PREFIX)/$(LIBDIR)/lv2/"$$plugin".lv2 ; \ install -t $(DESTDIR)$(PREFIX)/$(LIBDIR)/lv2/"$$plugin".lv2 \ bin/"$$plugin".lv2/* ; \ - done; \ + done; ifeq ($(HAVE_JACK),true) for plugin in $(PLUGINS); do \ install -t $(DESTDIR)$(PREFIX)/$(BINDIR) bin/"$$plugin" ; \ - done; \ + done; endif install -t $(DESTDIR)$(PREFIX)/$(LIBDIR)/ladspa bin/*-ladspa.so install -t $(DESTDIR)$(PREFIX)/$(LIBDIR)/vst bin/*-vst.so -- cgit v1.2.3