summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Zammit <damien@zamaudio.com>2015-10-30 21:18:07 +1100
committerDamien Zammit <damien@zamaudio.com>2015-10-30 21:18:07 +1100
commit18740efcd198960234a5ac7b79159dd773ecf79d (patch)
tree861e4d6195ddad49e48740501d397b31bac4fe68
parent575e72e7df61cebda0364e15b0541d7a5d147b35 (diff)
parentd1ac4b5f0ef7ce89d76f1361c7ca6d162fd5c930 (diff)
Merge pull request #33 from falkTX/limiterlimiter
Fixes for headless systems (limiter branch)
-rw-r--r--Makefile6
-rw-r--r--plugins/Makefile.mk6
-rw-r--r--plugins/ZaMaximX2/Makefile2
-rw-r--r--plugins/ZaMultiComp/Makefile2
-rw-r--r--plugins/ZaMultiCompX2/Makefile2
-rw-r--r--plugins/ZamAutoSat/Makefile2
-rw-r--r--plugins/ZamChild670/Makefile2
-rw-r--r--plugins/ZamComp/Makefile2
-rw-r--r--plugins/ZamCompX2/Makefile2
-rw-r--r--plugins/ZamEQ2/Makefile2
-rw-r--r--plugins/ZamGEQ31/Makefile2
-rw-r--r--plugins/ZamGate/Makefile2
-rw-r--r--plugins/ZamGateX2/Makefile2
-rw-r--r--plugins/ZamHeadX2/Makefile2
-rw-r--r--plugins/ZamNoise/Makefile2
-rw-r--r--plugins/ZamPiano/Makefile2
-rw-r--r--plugins/ZamSFZ/Makefile2
-rw-r--r--plugins/ZamSynth/Makefile2
-rw-r--r--plugins/ZamTube/Makefile2
19 files changed, 9 insertions, 37 deletions
diff --git a/Makefile b/Makefile
index cfd0c4a..fee069a 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; \
+ done;
+endif
install -t $(DESTDIR)$(PREFIX)/$(LIBDIR)/ladspa bin/*-ladspa.so
install -t $(DESTDIR)$(PREFIX)/$(LIBDIR)/vst bin/*-vst.so
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
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