From 60f0de5a0da7612cfaacf37c2d3e5ee795f353e1 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Thu, 2 Jun 2022 12:32:18 +0100
Subject: [PATCH] Cleanup makefile

Signed-off-by: falkTX <falktx@falktx.com>
---
 Makefile.base.mk    | 17 ++++++++++++-----
 Makefile.plugins.mk | 34 +++++++++++++++++++---------------
 2 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/Makefile.base.mk b/Makefile.base.mk
index d4bcdcfb..9d0e556c 100644
--- a/Makefile.base.mk
+++ b/Makefile.base.mk
@@ -252,9 +252,6 @@ endif
 
 HAVE_CAIRO  = $(shell $(PKG_CONFIG) --exists cairo && echo true)
 
-# Vulkan is not supported yet
-# HAVE_VULKAN = $(shell $(PKG_CONFIG) --exists vulkan && echo true)
-
 ifeq ($(MACOS_OR_WINDOWS),true)
 HAVE_OPENGL = true
 else
@@ -266,6 +263,9 @@ HAVE_XEXT    = $(shell $(PKG_CONFIG) --exists xext && echo true)
 HAVE_XRANDR  = $(shell $(PKG_CONFIG) --exists xrandr && echo true)
 endif
 
+# Vulkan is not supported yet
+# HAVE_VULKAN = $(shell $(PKG_CONFIG) --exists vulkan && echo true)
+
 # ---------------------------------------------------------------------------------------------------------------------
 # Check for optional libraries
 
@@ -278,7 +278,7 @@ ifeq ($(MACOS),true)
 HAVE_RTAUDIO    = true
 else ifeq ($(WINDOWS),true)
 HAVE_RTAUDIO    = true
-else ifneq ($(HAIKU),true)
+else
 HAVE_ALSA       = $(shell $(PKG_CONFIG) --exists alsa && echo true)
 HAVE_PULSEAUDIO = $(shell $(PKG_CONFIG) --exists libpulse-simple && echo true)
 ifeq ($(HAVE_ALSA),true)
@@ -289,7 +289,7 @@ endif
 endif
 endif
 
-# backwards compat
+# backwards compat, always available/enabled
 HAVE_JACK = true
 
 # ---------------------------------------------------------------------------------------------------------------------
@@ -418,6 +418,13 @@ PULSEAUDIO_FLAGS = $(shell $(PKG_CONFIG) --cflags libpulse-simple)
 PULSEAUDIO_LIBS  = $(shell $(PKG_CONFIG) --libs libpulse-simple)
 endif
 
+ifeq ($(HAVE_JACK),true)
+ifeq ($(STATIC_BUILD),true)
+JACK_FLAGS = $(shell $(PKG_CONFIG) --cflags jack)
+JACK_LIBS  = $(shell $(PKG_CONFIG) --libs jack)
+endif
+endif
+
 ifneq ($(HAIKU_OR_MACOS_OR_WINDOWS),true)
 SHARED_MEMORY_LIBS = -lrt
 endif
diff --git a/Makefile.plugins.mk b/Makefile.plugins.mk
index 2af556c6..c0958d5f 100644
--- a/Makefile.plugins.mk
+++ b/Makefile.plugins.mk
@@ -38,6 +38,10 @@ ifeq ($(HAVE_ALSA),true)
 BASE_FLAGS += -DHAVE_ALSA
 endif
 
+ifeq ($(HAVE_JACK),true)
+BASE_FLAGS += -DHAVE_JACK
+endif
+
 ifeq ($(HAVE_LIBLO),true)
 BASE_FLAGS += -DHAVE_LIBLO
 endif
@@ -46,10 +50,18 @@ ifeq ($(HAVE_PULSEAUDIO),true)
 BASE_FLAGS += -DHAVE_PULSEAUDIO
 endif
 
-ifeq ($(STATIC_BUILD),true)
-JACK_LIBS  += $(shell $(PKG_CONFIG) --libs jack)
+# always needed
+ifneq ($(HAIKU_OR_MACOS_OR_WINDOWS),true)
+ifneq ($(STATIC_BUILD),true)
+LINK_FLAGS += -ldl
+endif
 endif
 
+# ---------------------------------------------------------------------------------------------------------------------
+# JACK/Standalone setup
+
+ifeq ($(SKIP_RTAUDIO_FALLBACK),true)
+
 ifeq ($(MACOS),true)
 JACK_LIBS  += -framework CoreAudio -framework CoreFoundation
 else ifeq ($(WINDOWS),true)
@@ -58,28 +70,20 @@ JACK_LIBS  += -lole32 -lwinmm
 JACK_LIBS  += -ldsound
 # WASAPI
 # JACK_LIBS  += -lksuser -lmfplat -lmfuuid -lwmcodecdspuuid
-else ifneq ($(HAIKU),true)
-ifeq ($(HAVE_ALSA),true)
+else ifeq ($(HAVE_ALSA),true)
 JACK_FLAGS += $(ALSA_FLAGS)
 JACK_LIBS  += $(ALSA_LIBS)
-endif
-ifeq ($(HAVE_PULSEAUDIO),true)
+else ifeq ($(HAVE_PULSEAUDIO),true)
 JACK_FLAGS += $(PULSEAUDIO_FLAGS)
 JACK_LIBS  += $(PULSEAUDIO_LIBS)
 endif
+
 ifeq ($(HAVE_RTAUDIO),true)
+ifneq ($(HAIKU),true)
 JACK_LIBS  += -lpthread
-endif # !HAIKU
 endif
-
-# backwards compat
-BASE_FLAGS += -DHAVE_JACK
-
-# always needed
-ifneq ($(HAIKU_OR_MACOS_OR_WINDOWS),true)
-ifneq ($(STATIC_BUILD),true)
-LINK_FLAGS += -ldl
 endif
+
 endif
 
 # ---------------------------------------------------------------------------------------------------------------------