Use proper clap filename target

Makefile.plugins.mk

@@ -239,6 +239,18 @@ VST3_FILENAME = $(NAME).vst3/Contents/x86_64-win/$(NAME).vst3
 endif
 endif
 
+# ---------------------------------------------------------------------------------------------------------------------
+# Set CLAP filename, either single binary or inside a bundle
+
+ifeq ($(MACOS),true)
+CLAP_CONTENTS = $(NAME).clap/Contents
+CLAP_FILENAME = $(CLAP_CONTENTS)/MacOS/$(NAME)
+else ifeq ($(USE_CLAP_BUNDLE),true)
+CLAP_FILENAME = $(NAME).clap/$(NAME).clap
+else
+CLAP_FILENAME = $(NAME).clap
+endif
+
 # ---------------------------------------------------------------------------------------------------------------------
 # Set plugin binary file targets
 
@@ -264,7 +276,7 @@ vst2       = $(TARGET_DIR)/$(VST2_FILENAME)
 ifneq ($(VST3_FILENAME),)
 vst3       = $(TARGET_DIR)/$(VST3_FILENAME)
 endif
-clap       = $(TARGET_DIR)/$(NAME)-clap$(LIB_EXT)
+clap       = $(TARGET_DIR)/$(CLAP_FILENAME)
 shared     = $(TARGET_DIR)/$(NAME)$(LIB_EXT)
 static     = $(TARGET_DIR)/$(NAME).a
 
@@ -275,6 +287,9 @@ vst2files += $(TARGET_DIR)/$(VST2_CONTENTS)/Resources/empty.lproj
 vst3files += $(TARGET_DIR)/$(VST3_CONTENTS)/Info.plist
 vst3files += $(TARGET_DIR)/$(VST3_CONTENTS)/PkgInfo
 vst3files += $(TARGET_DIR)/$(VST3_CONTENTS)/Resources/empty.lproj
+clapfiles += $(TARGET_DIR)/$(CLAP_CONTENTS)/Info.plist
+clapfiles += $(TARGET_DIR)/$(CLAP_CONTENTS)/PkgInfo
+clapfiles += $(TARGET_DIR)/$(CLAP_CONTENTS)/Resources/empty.lproj
 endif
 
 ifneq ($(HAVE_DGL),true)
@@ -584,6 +599,10 @@ $(TARGET_DIR)/%.vst3/Contents/Info.plist: $(DPF_PATH)/utils/plugin.vst/Contents/
 	-@mkdir -p $(shell dirname $@)
 	$(SILENT)sed -e "s/@INFO_PLIST_PROJECT_NAME@/$(NAME)/" $< > $@
 
+$(TARGET_DIR)/%.clap/Contents/Info.plist: $(DPF_PATH)/utils/plugin.vst/Contents/Info.plist
+	-@mkdir -p $(shell dirname $@)
+	$(SILENT)sed -e "s/@INFO_PLIST_PROJECT_NAME@/$(NAME)/" $< > $@
+
 $(TARGET_DIR)/%/Contents/PkgInfo: $(DPF_PATH)/utils/plugin.vst/Contents/PkgInfo
 	-@mkdir -p $(shell dirname $@)
 	$(SILENT)cp $< $@

distrho/src/DistrhoPluginCLAP.cpp

@@ -21,8 +21,6 @@
 #include "clap/entry.h"
 #include "clap/plugin-factory.h"
 #include "clap/ext/audio-ports.h"
-#include "src/DistrhoDefines.h"
-#include "src/clap/version.h"
 
 START_NAMESPACE_DISTRHO