From 39a8095e86e2b2d632fbf64ff4689536fd0e8a37 Mon Sep 17 00:00:00 2001 From: brummer10 Date: Wed, 11 Oct 2023 08:14:35 +0200 Subject: [PATCH] Fix Makefile macros --- Makefile | 2 -- plugins/NeuralRecord/MOD/neuralrecord_dsp.ttl | 3 ++- plugins/NeuralRecord/Makefile | 14 +++----------- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 409a38e..aac6657 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,6 @@ endif # -------------------------------------------------------------- # Installation directories -BUIDL_MOD ?= false PREFIX ?= /usr/local BINDIR ?= $(PREFIX)/bin LIBDIR ?= $(PREFIX)/lib @@ -93,7 +92,6 @@ plugins: libs $(MAKE) all -C plugins/NeuralRecord MOD: clean - @BUIDL_MOD=true $(MAKE) mod -C plugins/NeuralRecord ifneq ($(CROSS_COMPILING),true) diff --git a/plugins/NeuralRecord/MOD/neuralrecord_dsp.ttl b/plugins/NeuralRecord/MOD/neuralrecord_dsp.ttl index 4979d39..ff2aad6 100644 --- a/plugins/NeuralRecord/MOD/neuralrecord_dsp.ttl +++ b/plugins/NeuralRecord/MOD/neuralrecord_dsp.ttl @@ -19,7 +19,8 @@ ; lv2:optionalFeature , - ; + , + ; lv2:requiredFeature opts:options , ; diff --git a/plugins/NeuralRecord/Makefile b/plugins/NeuralRecord/Makefile index 73d5557..102750c 100644 --- a/plugins/NeuralRecord/Makefile +++ b/plugins/NeuralRecord/Makefile @@ -11,7 +11,6 @@ NAME = neuralrecord # -------------------------------------------------------------- # Plugin types to build -ifeq ($(BUILD_MOD),false) BUILD_LV2 ?= true BUILD_VST2 ?= false BUILD_VST3 ?= true @@ -19,8 +18,6 @@ BUILD_CLAP ?= false BUILD_JACK ?= true BUILD_DSSI ?= false BUILD_LADSPA ?= false -endif - # -------------------------------------------------------------- # Files to build @@ -42,7 +39,6 @@ BUILD_CXX_FLAGS += -pthread `pkg-config --cflags sndfile` `pkg-config --libs sn # -------------------------------------------------------------- # Enable all selected plugin types -ifeq ($(BUILD_MOD),false) ifeq ($(BUILD_LV2),true) ifeq ($(HAVE_CAIRO),true) TARGETS += lv2_sep @@ -83,11 +79,6 @@ ifeq ($(BUILD_LADSPA),true) TARGETS += ladspa endif -else -BUILD_LV2 = true -TARGETS += lv2_dsp -endif - all: $(TARGETS) ifeq ($(BUILD_VST3),true) @cp -r resources $(TARGET_DIR)/$(NAME).vst3/Contents/x86_64-linux/ @@ -96,7 +87,7 @@ ifeq ($(BUILD_LV2),true) @cp -r resources $(TARGET_DIR)/$(NAME).lv2/ endif -mod: $(TARGETS) +mod: lv2_dsp ifeq ($(BUILD_LV2),true) @cp -r resources $(TARGET_DIR)/$(NAME).lv2/ @cp -r MOD/* $(TARGET_DIR)/$(NAME).lv2/ @@ -132,7 +123,8 @@ endif ifeq ($(BUILD_LV2),true) @mkdir -p -m755 $(DESTDIR)$(LV2_DIR)/$(NAME).lv2 && \ install -m755 $(TARGET_DIR)/$(NAME).lv2/*$(LIB_EXT) $(DESTDIR)$(LV2_DIR)/$(NAME).lv2 && \ - install -m644 $(TARGET_DIR)/$(NAME).lv2/*.ttl $(DESTDIR)$(LV2_DIR)/$(NAME).lv2 + install -m644 $(TARGET_DIR)/$(NAME).lv2/*.ttl $(DESTDIR)$(LV2_DIR)/$(NAME).lv2 && \ + cp -r $(TARGET_DIR)/$(NAME).lv2/resources $(DESTDIR)$(LV2_DIR)/$(NAME).lv2 endif ifeq ($(BUILD_JACK),true) ifeq ($(HAVE_JACK),true)