Get rid of hardcoded "-ldl"; Cleanup

source/Makefile.mk

@@ -337,6 +337,10 @@ endif
 # ---------------------------------------------------------------------------------------------------------------------
 # Set libs stuff (part 1)
 
+ifeq ($(LINUX_OR_MACOS),true)
+LIBDL_LIBS = -ldl
+endif
+
 ifeq ($(HAVE_LIBLO),true)
 LIBLO_FLAGS = $(shell pkg-config --cflags liblo)
 LIBLO_LIBS  = $(shell pkg-config --libs liblo)
@@ -388,50 +392,63 @@ RTAUDIO_FLAGS += -D__RTAUDIO_DEBUG__
 RTMIDI_FLAGS  += -D__RTMIDI_DEBUG__
 endif
 
-ifneq ($(HAIKU),true)
-RTMEMPOOL_LIBS = -lpthread
-endif
-
 ifeq ($(UNIX),true)
 RTAUDIO_FLAGS        += -D__UNIX_JACK__
 endif
 
+ifeq ($(BSD),true)
+JACKBRIDGE_LIBS  = -lpthread -lrt
+LILV_LIBS        = -lm -lrt
+RTMEMPOOL_LIBS   = -lpthread
+WATER_LIBS       = -lpthread -lrt
+endif
+
+ifneq ($(HAIKU),true)
+JACKBRIDGE_LIBS  = -lpthread
+LILV_LIBS        = -lm
+RTMEMPOOL_LIBS   = -lpthread
+WATER_LIBS       = -lpthread
+endif
+
 ifeq ($(LINUX),true)
-HYLIA_FLAGS           = -DLINK_PLATFORM_LINUX=1
-JACKBRIDGE_LIBS       = -ldl -lpthread -lrt
-LILV_LIBS             = -ldl -lm -lrt
-WATER_LIBS            = -ldl -lpthread -lrt
+HYLIA_FLAGS      = -DLINK_PLATFORM_LINUX=1
+JACKBRIDGE_LIBS  = -ldl -lpthread -lrt
+LILV_LIBS        = -ldl -lm -lrt
+RTMEMPOOL_LIBS   = -lpthread -lrt
+WATER_LIBS       = -ldl -lpthread -lrt
 ifeq ($(HAVE_ALSA),true)
-RTAUDIO_FLAGS        += $(shell pkg-config --cflags alsa) -D__LINUX_ALSA__
-RTAUDIO_LIBS         += $(shell pkg-config --libs alsa) -lpthread
-RTMIDI_FLAGS         += $(shell pkg-config --cflags alsa) -D__LINUX_ALSA__
-RTMIDI_LIBS          += $(shell pkg-config --libs alsa)
+RTAUDIO_FLAGS   += $(shell pkg-config --cflags alsa) -D__LINUX_ALSA__
+RTAUDIO_LIBS    += $(shell pkg-config --libs alsa) -lpthread
+RTMIDI_FLAGS    += $(shell pkg-config --cflags alsa) -D__LINUX_ALSA__
+RTMIDI_LIBS     += $(shell pkg-config --libs alsa)
 endif
 ifeq ($(HAVE_PULSEAUDIO),true)
-RTAUDIO_FLAGS        += $(shell pkg-config --cflags libpulse-simple) -D__LINUX_PULSE__
-RTAUDIO_LIBS         += $(shell pkg-config --libs libpulse-simple)
+RTAUDIO_FLAGS   += $(shell pkg-config --cflags libpulse-simple) -D__LINUX_PULSE__
+RTAUDIO_LIBS    += $(shell pkg-config --libs libpulse-simple)
 endif
 endif
 
 ifeq ($(MACOS),true)
-HYLIA_FLAGS            = -DLINK_PLATFORM_MACOSX=1
-JACKBRIDGE_LIBS        = -ldl -lpthread
-LILV_LIBS              = -ldl -lm
-RTAUDIO_FLAGS         += -D__MACOSX_CORE__
-RTAUDIO_LIBS          += -framework CoreAudio
-RTMIDI_FLAGS          += -D__MACOSX_CORE__
-RTMIDI_LIBS           += -framework CoreMIDI
-WATER_LIBS             = -framework AppKit
+HYLIA_FLAGS      = -DLINK_PLATFORM_MACOSX=1
+JACKBRIDGE_LIBS  = -ldl -lpthread
+LILV_LIBS        = -ldl -lm
+RTMEMPOOL_LIBS   = -lpthread
+WATER_LIBS       = -framework AppKit
+RTAUDIO_FLAGS   += -D__MACOSX_CORE__
+RTAUDIO_LIBS    += -framework CoreAudio
+RTMIDI_FLAGS    += -D__MACOSX_CORE__
+RTMIDI_LIBS     += -framework CoreMIDI
 endif
 
 ifeq ($(WIN32),true)
-HYLIA_FLAGS            = -DLINK_PLATFORM_WINDOWS=1
-JACKBRIDGE_LIBS        = -lpthread
-LILV_LIBS              = -lm
-RTAUDIO_FLAGS         += -D__WINDOWS_ASIO__ -D__WINDOWS_DS__ -D__WINDOWS_WASAPI__
-RTAUDIO_LIBS          += -ldsound -luuid -lksuser -lwinmm
-RTMIDI_FLAGS          += -D__WINDOWS_MM__
-WATER_LIBS             = -luuid -lwsock32 -lwininet -lversion -lole32 -lws2_32 -loleaut32 -limm32 -lcomdlg32 -lshlwapi -lrpcrt4 -lwinmm
+HYLIA_FLAGS      = -DLINK_PLATFORM_WINDOWS=1
+JACKBRIDGE_LIBS  = -lpthread
+LILV_LIBS        = -lm
+RTMEMPOOL_LIBS   = -lpthread
+WATER_LIBS       = -luuid -lwsock32 -lwininet -lversion -lole32 -lws2_32 -loleaut32 -limm32 -lcomdlg32 -lshlwapi -lrpcrt4 -lwinmm
+RTAUDIO_FLAGS   += -D__WINDOWS_ASIO__ -D__WINDOWS_DS__ -D__WINDOWS_WASAPI__
+RTAUDIO_LIBS    += -ldsound -luuid -lksuser -lwinmm
+RTMIDI_FLAGS    += -D__WINDOWS_MM__
 endif
 
 # ---------------------------------------------------------------------------------------------------------------------

source/bridges-plugin/Makefile

@@ -64,21 +64,9 @@ LIBS_win32   += $(MODULEDIR)/water.win32.a
 LIBS_win64   += $(MODULEDIR)/water.win64.a
 LINK_FLAGS   += $(WATER_LIBS)
 
-ifeq ($(HAVE_LIBLO),true)
 LINK_FLAGS += $(LIBLO_LIBS)
-endif
-
-ifeq ($(HAVE_LIBMAGIC),true)
 LINK_FLAGS += $(MAGIC_LIBS)
-endif
-
-ifeq ($(HAVE_X11),true)
 LINK_FLAGS += $(X11_LIBS)
-endif
-
-ifeq ($(UNIX),true)
-LINK_FLAGS += -ldl -lpthread
-endif
 
 # ----------------------------------------------------------------------------------------------------------------------
 

source/bridges-ui/Makefile

@@ -32,22 +32,22 @@ endif
 # ----------------------------------------------------------------------------------------------------------------------------
 
 BUILD_GTK2_FLAGS    = $(BUILD_CXX_FLAGS) -DBRIDGE_GTK2 $(shell pkg-config --cflags gtk+-2.0)
-LINK_GTK2_FLAGS     = $(LINK_FLAGS) $(shell pkg-config --libs gtk+-2.0) -ldl
+LINK_GTK2_FLAGS     = $(LINK_FLAGS) $(shell pkg-config --libs gtk+-2.0) $(LIBDL_LIBS)
 
 BUILD_GTK3_FLAGS    = $(BUILD_CXX_FLAGS) -DBRIDGE_GTK3 $(shell pkg-config --cflags gtk+-3.0)
-LINK_GTK3_FLAGS     = $(LINK_FLAGS) $(shell pkg-config --libs gtk+-3.0) -ldl
+LINK_GTK3_FLAGS     = $(LINK_FLAGS) $(shell pkg-config --libs gtk+-3.0) $(LIBDL_LIBS)
 
 BUILD_QT4_FLAGS     = $(BUILD_CXX_FLAGS) -DBRIDGE_QT4 $(shell pkg-config --cflags QtCore QtGui) -I$(OBJDIR) -I$(CWD)/theme -Wno-unused-variable
-LINK_QT4_FLAGS      = $(LINK_FLAGS) $(shell pkg-config --libs QtCore QtGui) -ldl
+LINK_QT4_FLAGS      = $(LINK_FLAGS) $(shell pkg-config --libs QtCore QtGui) $(LIBDL_LIBS)
 
 BUILD_QT5_FLAGS     = $(BUILD_CXX_FLAGS) -DBRIDGE_QT5 $(shell pkg-config --cflags Qt5Core Qt5Gui Qt5Widgets) -I$(OBJDIR) -I$(CWD)/theme
-LINK_QT5_FLAGS      = $(LINK_FLAGS) $(shell pkg-config --libs Qt5Core Qt5Gui Qt5Widgets) -ldl
+LINK_QT5_FLAGS      = $(LINK_FLAGS) $(shell pkg-config --libs Qt5Core Qt5Gui Qt5Widgets) $(LIBDL_LIBS)
 
 BUILD_X11_FLAGS     = $(BUILD_CXX_FLAGS) -DBRIDGE_X11 $(X11_FLAGS)
-LINK_X11_FLAGS      = $(LINK_FLAGS) $(X11_LIBS) -ldl
+LINK_X11_FLAGS      = $(LINK_FLAGS) $(X11_LIBS) $(LIBDL_LIBS)
 
 BUILD_COCOA_FLAGS   = $(BUILD_CXX_FLAGS) -DBRIDGE_COCOA -ObjC++
-LINK_COCOA_FLAGS    = $(LINK_FLAGS) -framework Cocoa -framework IOKit -framework QuartzCore -ldl
+LINK_COCOA_FLAGS    = $(LINK_FLAGS) -framework Cocoa -framework IOKit -framework QuartzCore $(LIBDL_LIBS)
 
 BUILD_WINDOWS_FLAGS = $(BUILD_CXX_FLAGS) -DBRIDGE_HWND
 LINK_WINDOWS_FLAGS  = $(LINK_FLAGS) -static -mwindows

source/discovery/Makefile

@@ -68,9 +68,7 @@ LIBS_win32   += $(MODULEDIR)/water.win32.a
 LIBS_win64   += $(MODULEDIR)/water.win64.a
 LINK_FLAGS   += $(WATER_LIBS)
 
-ifeq ($(UNIX),true)
-LINK_FLAGS += -ldl
-endif
+LINK_FLAGS   += $(LIBDL_LIBS)
 
 # ----------------------------------------------------------------------------------------------------------------------------
 

source/interposer/Makefile

@@ -23,8 +23,8 @@ endif
 
 BUILD_CXX_FLAGS += -I$(CWD) -I$(CWD)/backend -I$(CWD)/includes -I$(CWD)/modules -I$(CWD)/utils
 
-INTERPOSER_SAFE_LIBS = -ldl
-INTERPOSER_X11_LIBS  = $(X11_LIBS) -ldl
+INTERPOSER_SAFE_LIBS = $(LIBDL_LIBS)
+INTERPOSER_X11_LIBS  = $(X11_LIBS) $(LIBDL_LIBS)
 
 # ----------------------------------------------------------------------------------------------------------------------
 

source/jackbridge/Makefile

@@ -18,11 +18,11 @@ LINK_FLAGS      += $(JACKBRIDGE_LIBS)
 ifeq ($(MACOS),true)
 WINE_32BIT_FLAGS = $(32BIT_FLAGS)
 WINE_64BIT_FLAGS = $(64BIT_FLAGS)
-WINE_LINK_FLAGS  = $(LINK_FLAGS) -ldl -lpthread
+WINE_LINK_FLAGS  = $(LINK_FLAGS) $(LIBDL_LIBS) -lpthread
 else
 WINE_32BIT_FLAGS = $(32BIT_FLAGS) -L/usr/lib32/wine -L/usr/lib/i386-linux-gnu/wine -L/opt/wine-staging/lib -L/opt/wine-staging/lib/wine
 WINE_64BIT_FLAGS = $(64BIT_FLAGS) -L/usr/lib64/wine -L/usr/lib/x86_64-linux-gnu/wine -L/opt/wine-staging/lib64 -L/opt/wine-staging/lib64/wine
-WINE_LINK_FLAGS  = $(LINK_FLAGS) -ldl -lrt -lpthread
+WINE_LINK_FLAGS  = $(LINK_FLAGS) $(LIBDL_LIBS) -lrt -lpthread
 endif
 
 # ----------------------------------------------------------------------------------------------------------------------------

source/native-plugins/external/Makefile.mk

@@ -114,9 +114,7 @@ ZYN_BASE_FLAGS += -DHAVE_ASYNC
 endif
 
 ZYN_BASE_LIBS   = $(shell pkg-config --libs liblo mxml) -lpthread
-ifneq ($(WIN32),true)
-ZYN_BASE_LIBS  += -ldl
-endif
+ZYN_BASE_LIBS  += $(LIBDL_LIBS)
 
 # DSP flags
 ZYN_DSP_FLAGS  = $(ZYN_BASE_FLAGS)
@@ -173,7 +171,7 @@ ZITA_UI_FLAGS   = $(shell pkg-config --cflags cairo libpng12 freetype2 x11 xft z
 ZITA_UI_FLAGS  += -Wno-ignored-qualifiers -Wno-unused-parameter -Wno-unused-result
 ZITA_UI_LIBS    = $(shell pkg-config --libs cairo libpng12 freetype2 zlib)
 ZITA_UI_LIBS   += -lclxclient -lclthreads $(shell pkg-config --libs x11 xft)
-ZITA_UI_LIBS   += -ldl -lpthread -lrt
+ZITA_UI_LIBS   += $(LIBDL_LIBS) -lpthread -lrt
 endif
 
 # ---------------------------------------------------------------------------------------------------------------------