Start reworking the makefiles

Makefile

@@ -11,8 +11,6 @@ include source/Makefile.mk
 PREFIX  = /usr/local
 DESTDIR =
 
-SED_PREFIX = $(shell echo $(PREFIX) | sed "s/\//\\\\\\\\\//g")
-
 LINK = ln -sf
 
 ifeq ($(DEFAULT_QT),5)
@@ -25,67 +23,122 @@ endif
 
 # --------------------------------------------------------------
 
-all: CXX RES UI WIDGETS
+all: BIN RES UI WIDGETS
 
 # --------------------------------------------------------------
 # C++ code (native)
 
-ifeq ($(HAVE_JUCE),true)
-CXX: backend bridges discovery plugin plugin_ui theme
-else
-CXX: backend bridges discovery theme
+.FORCE:
+.PHONY: .FORCE
+
+ALL_LIBS += source/modules/jackbridge.a
+ALL_LIBS += source/modules/rtaudio.a
+ALL_LIBS += source/modules/rtmempool.a
+ALL_LIBS += source/modules/rtmidi.a
+ALL_LIBS += source/modules/native-plugins.a
+
+ifeq ($(CARLA_PLUGIN_SUPPORT),true)
+ALL_LIBS += source/modules/lilv.a
 endif
 
-backend:
-	$(MAKE) -C source/backend
+ifeq ($(HAVE_AF_DEPS),true)
+ALL_LIBS += source/modules/audio_decoder.a
+endif
 
-bridges:
-	$(MAKE) -C source/bridges
+ifeq ($(HAVE_DGL),true)
+ALL_LIBS += source/modules/dgl.a
+endif
 
-discovery:
-	$(MAKE) -C source/discovery
+ifeq ($(HAVE_JUCE),true)
+ALL_LIBS += source/modules/juce_audio_basics.a
+ALL_LIBS += source/modules/juce_audio_devices.a
+ALL_LIBS += source/modules/juce_audio_formats.a
+ALL_LIBS += source/modules/juce_audio_processors.a
+ALL_LIBS += source/modules/juce_core.a
+ALL_LIBS += source/modules/juce_data_structures.a
+ALL_LIBS += source/modules/juce_events.a
+ALL_LIBS += source/modules/juce_graphics.a
+ALL_LIBS += source/modules/juce_gui_basics.a
+ALL_LIBS += source/modules/juce_gui_extra.a
+endif
 
-plugin:
-	$(MAKE) -C source/plugin
+BIN = \
+	bin/libcarla_standalone2.$(LIB_EXT)
 
-plugin_ui: source/carla-plugin source/carla_config.py source/*.py RES UI WIDGETS
-	$(LINK) $(CURDIR)/source/carla-plugin source/modules/native-plugins/resources/
-	$(LINK) $(CURDIR)/source/*.py         source/modules/native-plugins/resources/
+BIN: $(BIN)
 
-theme:
-	$(MAKE) -C source/modules/theme
+source/modules/%.a: .FORCE
+	$(MAKE) -C source/modules/$* ../$*.a
 
-# --------------------------------------------------------------
-# C++ code (variants)
+bin/libcarla_standalone2.$(LIB_EXT): .FORCE
+	$(MAKE) -C source/backend/standalone
 
-posix32:
-	$(MAKE) -C source/bridges posix32
-	$(MAKE) -C source/discovery posix32
+# ifeq ($(WIN32),true)
+# CXX += \
+# 	bin/carla-discovery-native.exe
+# else
+# CXX += \
+# 	bin/carla-discovery-native
+# endif
 
-posix64:
-	$(MAKE) -C source/bridges posix64
-	$(MAKE) -C source/discovery posix64
+# backend bridges discovery theme
 
-win32:
-	$(MAKE) -C source/bridges win32
-	$(MAKE) -C source/discovery win32
+# ifeq ($(HAVE_JUCE),true)
+# CXX_TARGETS += plugin plugin_ui
+# endif
 
-win64:
-	$(MAKE) -C source/bridges win64
-	$(MAKE) -C source/discovery win64
+# backend:
+# 	$(MAKE) -C source/backend
+#
+# bridges:
+# 	$(MAKE) -C source/bridges
+#
+# discovery:
+# 	$(MAKE) -C source/discovery
+#
+# plugin:
+# 	$(MAKE) -C source/plugin
+#
+# plugin_ui: source/carla-plugin source/carla_config.py source/*.py RES UI WIDGETS
+# 	$(LINK) $(CURDIR)/source/carla-plugin source/modules/native-plugins/resources/
+# 	$(LINK) $(CURDIR)/source/*.py         source/modules/native-plugins/resources/
+#
+# theme:
+# 	$(MAKE) -C source/modules/theme
 
-wine32:
-	$(MAKE) -C source/modules jackbridge-wine32
-	$(LINK) ../modules/jackbridge-win32.dll.so source/bridges/jackbridge-win32.dll
+# --------------------------------------------------------------
+# C++ code (variants)
 
-wine64:
-	$(MAKE) -C source/modules jackbridge-wine64
-	$(LINK) ../modules/jackbridge-win64.dll.so source/bridges/jackbridge-win64.dll
+# posix32:
+# 	$(MAKE) -C source/bridges posix32
+# 	$(MAKE) -C source/discovery posix32
+#
+# posix64:
+# 	$(MAKE) -C source/bridges posix64
+# 	$(MAKE) -C source/discovery posix64
+#
+# win32:
+# 	$(MAKE) -C source/bridges win32
+# 	$(MAKE) -C source/discovery win32
+#
+# win64:
+# 	$(MAKE) -C source/bridges win64
+# 	$(MAKE) -C source/discovery win64
+#
+# wine32:
+# 	$(MAKE) -C source/modules jackbridge-wine32
+# 	$(LINK) ../modules/jackbridge-win32.dll.so source/bridges/jackbridge-win32.dll
+#
+# wine64:
+# 	$(MAKE) -C source/modules jackbridge-wine64
+# 	$(LINK) ../modules/jackbridge-win64.dll.so source/bridges/jackbridge-win64.dll
 
 # --------------------------------------------------------------
 # Resources
 
-RES = source/carla_config.py source/resources_rc.py
+RES = \
+	source/carla_config.py \
+	source/resources_rc.py
 
 RES: $(RES)
 
@@ -146,11 +199,11 @@ source/%.py: source/widgets/%.py
 # --------------------------------------------------------------
 
 clean:
-	$(MAKE) clean -C source/backend
-	$(MAKE) clean -C source/bridges
-	$(MAKE) clean -C source/discovery
-	$(MAKE) clean -C source/modules
-	$(MAKE) clean -C source/plugin
+# 	$(MAKE) clean -C source/backend
+# 	$(MAKE) clean -C source/bridges
+# 	$(MAKE) clean -C source/discovery
+# 	$(MAKE) clean -C source/modules
+# 	$(MAKE) clean -C source/plugin
 	rm -f $(RES)
 	rm -f $(UIs)
 	rm -f $(WIDGETS)
@@ -290,7 +343,7 @@ install:
 	$(MAKE) STYLES_DIR=$(DESTDIR)$(PREFIX)/lib/lv2/carla-native.lv2/resources/styles install-main -C source/modules/theme
 
 	# Adjust PREFIX value in script files
-	sed -i "s/X-PREFIX-X/$(SED_PREFIX)/" \
+	sed -i "s?X-PREFIX-X?$(PREFIX)?" \
 		$(DESTDIR)$(PREFIX)/bin/carla \
 		$(DESTDIR)$(PREFIX)/bin/carla-database \
 		$(DESTDIR)$(PREFIX)/bin/carla-patchbay \

source/Makefile.mk

@@ -442,3 +442,33 @@ endif
 endif
 
 # --------------------------------------------------------------
+# Set shared lib extension
+
+LIB_EXT = so
+
+ifeq ($(MACOS),true)
+LIB_EXT = dylib
+endif
+
+ifeq ($(WIN32),true)
+LIB_EXT = dll
+endif
+
+# --------------------------------------------------------------
+# Set static libs start & end
+
+ifneq ($(MACOS),true)
+LIBS_START = -Wl,--start-group
+LIBS_END   = -Wl,--end-group
+endif
+
+# --------------------------------------------------------------
+# Set shared library CLI arg
+
+ifeq ($(MACOS),true)
+SHARED = -dynamiclib
+else
+SHARED = -shared
+endif
+
+# --------------------------------------------------------------

source/backend/standalone/Makefile

@@ -100,15 +100,8 @@ LINK_FLAGS  += $(NATIVE_PLUGINS_LIBS)
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
-ifeq ($(WIN32),true)
-TARGET = ../libcarla_standalone2.dll
-else
-ifeq ($(MACOS),true)
-TARGET = ../libcarla_standalone2.dylib
-else
-TARGET = ../libcarla_standalone2.so
-endif
-endif
+BIN_PATH = ../../../bin
+TARGET   = $(BIN_PATH)/libcarla_standalone2.$(LIB_EXT)
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
@@ -122,14 +115,8 @@ debug:
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
-../libcarla_standalone2.dll: CarlaStandalone.cpp.o $(STATIC_LIBS)
-	$(CXX) $< -Wl,--start-group $(STATIC_LIBS) -Wl,--end-group $(LINK_FLAGS) $(EXTRA_LIBS) -shared -Wl,--output-def,$@.def -o $@
-
-../libcarla_standalone2.dylib: CarlaStandalone.cpp.o $(STATIC_LIBS)
-	$(CXX) $< $(STATIC_LIBS) $(LINK_FLAGS) -dynamiclib -o $@
-
-../libcarla_standalone2.so: CarlaStandalone.cpp.o $(STATIC_LIBS)
-	$(CXX) $< -Wl,--start-group $(STATIC_LIBS) -Wl,--end-group $(LINK_FLAGS) -shared -o $@
+$(TARGET): CarlaStandalone.cpp.o $(STATIC_LIBS)
+	$(CXX) $< $(LIBS_START) $(STATIC_LIBS) $(LIBS_END) $(LINK_FLAGS) $(EXTRA_LIBS) $(SHARED) -o $@
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
@@ -138,13 +125,10 @@ CarlaStandalone.cpp.o: CarlaStandalone.cpp $(CARLA_STANDALONE_CPP_DEPS)
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
-.FORCE:
-.PHONY: .FORCE
-
-../libcarla_%.a: .FORCE
+../carla_%.a:
 	$(MAKE) -C ../$*
 
-../../modules/%.a: .FORCE
+../../modules/%.a:
 	$(MAKE) -C ../../modules $*
 
 # ----------------------------------------------------------------------------------------------------------------------------

source/discovery/Makefile

@@ -148,9 +148,9 @@ OBJS = carla-discovery.cpp
 # --------------------------------------------------------------
 
 ifeq ($(WIN32),true)
-all: carla-discovery-native.exe
+all: ../../../bin/carla-discovery-native.exe
 else
-all: carla-discovery-native
+all: ../../../bin/carla-discovery-native
 endif
 
 posix32: carla-discovery-posix32
@@ -160,7 +160,7 @@ win64:   carla-discovery-win64.exe
 
 # --------------------------------------------------------------
 
-carla-discovery-native: $(OBJS) $(DEPS) $(LIBS)
+../../../bin/carla-discovery-native: $(OBJS) $(DEPS) $(LIBS)
 ifeq ($(MACOS),true)
 	$(CXX) $< $(LIBS) $(POSIX_BUILD_FLAGS) $(NATIVE_FLAGS) $(POSIX_LINK_FLAGS) -o $@
 else

source/modules/Makefile

@@ -8,22 +8,6 @@ all:
 
 # --------------------------------------------------------------
 
-audio_decoder:
-	$(MAKE) -C audio_decoder
-
-audio_decoder_%:
-	$(MAKE) -C audio_decoder $*
-
-# --------------------------------------------------------------
-
-dgl:
-	$(MAKE) -C dgl
-
-dgl_%:
-	$(MAKE) -C dgl $*
-
-# --------------------------------------------------------------
-
 juce_audio_basics:
 	$(MAKE) -C juce_audio_basics
 

source/modules/audio_decoder/Makefile

@@ -8,78 +8,46 @@ include ../../Makefile.mk
 
 # --------------------------------------------------------------
 
-BUILD_C_FLAGS += $(AUDIO_DECODER_FLAGS) -I..
-LINK_FLAGS    += $(AUDIO_DECODER_LIBS)
-
-OBJS         = ad_ffmpeg.c.o         ad_plugin.c.o         ad_soundfile.c.o
-OBJS_posix32 = ad_ffmpeg.c.posix32.o ad_plugin.c.posix32.o ad_soundfile.c.posix32.o
-OBJS_posix64 = ad_ffmpeg.c.posix64.o ad_plugin.c.posix64.o ad_soundfile.c.posix64.o
-OBJS_win32   = ad_ffmpeg.c.win32.o   ad_plugin.c.win32.o   ad_soundfile.c.win32.o
-OBJS_win64   = ad_ffmpeg.c.win64.o   ad_plugin.c.win64.o   ad_soundfile.c.win64.o
+BUILD_C_FLAGS += $(AUDIO_DECODER_FLAGS) -I. -I..
 
 # --------------------------------------------------------------
 
-all: ../audio_decoder.a
+OBJS = \
+	ad_ffmpeg.c.o \
+	ad_plugin.c.o \
+	ad_soundfile.c.o
 
-posix32: ../audio_decoder.posix32.a
-posix64: ../audio_decoder.posix64.a
-win32:   ../audio_decoder.win32.a
-win64:   ../audio_decoder.win64.a
+TARGETS = \
+	../audio_decoder.a
 
 # --------------------------------------------------------------
 
-../audio_decoder.a: $(OBJS)
-	$(RM) $@
-	$(AR) crs $@ $^
+all: $(TARGETS)
 
-../audio_decoder.posix32.a: $(OBJS_posix32)
-	$(RM) $@
-	$(AR) crs $@ $^
+# --------------------------------------------------------------
 
-../audio_decoder.posix64.a: $(OBJS_posix64)
-	$(RM) $@
-	$(AR) crs $@ $^
+clean:
+	$(RM) $(OBJS)
+	$(RM) $(TARGETS)
 
-../audio_decoder.win32.a: $(OBJS_win32)
-	$(RM) $@
-	$(AR) crs $@ $^
+debug:
+	$(MAKE) DEBUG=true
+
+# --------------------------------------------------------------
 
-../audio_decoder.win64.a: $(OBJS_win64)
+../audio_decoder.a: $(OBJS)
 	$(RM) $@
 	$(AR) crs $@ $^
 
-../libaudio_decoder.dll: $(OBJS)
-	$(CC) $^ -shared $(LINK_FLAGS) -o $@
-
-../libaudio_decoder.dylib: $(OBJS)
-	$(CC) $^ -dynamiclib $(LINK_FLAGS) -o $@
-
-../libaudio_decoder.so: $(OBJS)
-	$(CC) $^ -shared $(LINK_FLAGS) -o $@
-
 # --------------------------------------------------------------
 
-%.c.o: %.c
+ad_ffmpeg.c.o: ad_ffmpeg.c ad_plugin.h ffcompat.h ad.h
 	$(CC) $< $(BUILD_C_FLAGS) -c -o $@
 
-%.c.posix32.o: %.c
-	$(CC) $< $(BUILD_C_FLAGS) $(32BIT_FLAGS) -c -o $@
-
-%.c.posix64.o: %.c
-	$(CC) $< $(BUILD_C_FLAGS) $(64BIT_FLAGS) -c -o $@
-
-%.c.win32.o: %.c
-	$(CC) $< $(BUILD_C_FLAGS) $(32BIT_FLAGS) -c -o $@
-
-%.c.win64.o: %.c
-	$(CC) $< $(BUILD_C_FLAGS) $(64BIT_FLAGS) -c -o $@
-
-# --------------------------------------------------------------
-
-clean:
-	$(RM) *.o ../audio_decoder*.a ../libaudio_decoder.*
+ad_plugin.c.o: ad_plugin.c ad_plugin.h ad.h
+	$(CC) $< $(BUILD_C_FLAGS) -c -o $@
 
-debug:
-	$(MAKE) DEBUG=true
+ad_soundfile.c.o: ad_soundfile.c ad_plugin.h ad.h
+	$(CC) $< $(BUILD_C_FLAGS) -c -o $@
 
 # --------------------------------------------------------------

source/modules/dgl/Makefile

@@ -8,9 +8,9 @@ include ../../Makefile.mk
 
 # --------------------------------------------------------------
 
-BUILD_C_FLAGS   += $(DGL_FLAGS) -I.
 BUILD_CXX_FLAGS += $(DGL_FLAGS) -I.
-LINK_FLAGS      += $(DGL_LIBS)
+
+# --------------------------------------------------------------
 
 OBJS = \
 	src/App.cpp.o \
@@ -30,119 +30,71 @@ else
 OBJS += src/Window.cpp.o
 endif
 
-OBJS_posix32 = \
-	src/App.cpp.posix32.o \
-	src/Geometry.cpp.posix32.o \
-	src/Image.cpp.posix32.o \
-	src/ImageAboutWindow.cpp.posix32.o \
-	src/ImageButton.cpp.posix32.o \
-	src/ImageKnob.cpp.posix32.o \
-	src/ImageSlider.cpp.posix32.o \
-	src/Widget.cpp.posix32.o \
-	src/Window.cpp.posix32.o
-
-OBJS_posix64 = \
-	src/App.cpp.posix64.o \
-	src/Geometry.cpp.posix64.o \
-	src/Image.cpp.posix64.o \
-	src/ImageAboutWindow.cpp.posix64.o \
-	src/ImageButton.cpp.posix64.o \
-	src/ImageKnob.cpp.posix64.o \
-	src/ImageSlider.cpp.posix64.o \
-	src/Widget.cpp.posix64.o \
-	src/Window.cpp.posix64.o
-
-OBJS_win32 = \
-	src/App.cpp.win32.o \
-	src/Geometry.cpp.win32.o \
-	src/Image.cpp.win32.o \
-	src/ImageAboutWindow.cpp.win32.o \
-	src/ImageButton.cpp.win32.o \
-	src/ImageKnob.cpp.win32.o \
-	src/ImageSlider.cpp.win32.o \
-	src/Widget.cpp.win32.o \
-	src/Window.cpp.win32.o
-
-OBJS_win64 = \
-	src/App.cpp.win64.o \
-	src/Geometry.cpp.win64.o \
-	src/Image.cpp.win64.o \
-	src/ImageAboutWindow.cpp.win64.o \
-	src/ImageButton.cpp.win64.o \
-	src/ImageKnob.cpp.win64.o \
-	src/ImageSlider.cpp.win64.o \
-	src/Widget.cpp.win64.o \
-	src/Window.cpp.win64.o
+TARGETS = \
+	../dgl.a
 
 # --------------------------------------------------------------
 
-all: ../dgl.a
-
-posix32: ../dgl.posix32.a
-posix64: ../dgl.posix64.a
-win32:   ../dgl.win32.a
-win64:   ../dgl.win64.a
+all: $(TARGETS)
 
 # --------------------------------------------------------------
 
-../dgl.a: $(OBJS)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-../dgl.posix32.a: $(OBJS_posix32)
-	$(RM) $@
-	$(AR) crs $@ $^
+clean:
+	$(RM) $(OBJS)
+	$(RM) $(TARGETS)
 
-../dgl.posix64.a: $(OBJS_posix64)
-	$(RM) $@
-	$(AR) crs $@ $^
+debug:
+	$(MAKE) DEBUG=true
 
-../dgl.win32.a: $(OBJS_win32)
-	$(RM) $@
-	$(AR) crs $@ $^
+# --------------------------------------------------------------
 
-../dgl.win64.a: $(OBJS_win64)
+../dgl.a: $(OBJS)
 	$(RM) $@
 	$(AR) crs $@ $^
 
-../libdgl.dll: $(OBJS)
-	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
+# --------------------------------------------------------------
 
-../libdgl.dylib: $(OBJS)
-	$(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@
+BASE_HPP     = Base.hpp ../distrho/extra/d_leakdetector.hpp ../distrho/extra/d_scopedpointer.hpp ../distrho/DistrhoUtils.hpp ../distrho/src/DistrhoDefines.h
+APP_PRIV_HPP = src/AppPrivateData.hpp App.hpp ../distrho/extra/d_sleep.hpp $(BASE_HPP)
+GEOMETRY_HPP = Geometry.hpp $(BASE_HPP)
+IMAGE_HPP    = Image.hpp $(GEOMETRY_HPP)
+WIDGET_HPP   = Widget.hpp $(GEOMETRY_HPP)
+WINDOW_HPP   = Window.hpp $(GEOMETRY_HPP)
 
-../libdgl.so: $(OBJS)
-	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
+src/App.cpp.o: src/App.cpp $(APP_PRIV_HPP) $(WINDOW_HPP)
+	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-# --------------------------------------------------------------
+src/Geometry.cpp.o: src/Geometry.cpp $(GEOMETRY_HPP)
+	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-%.cpp.o: %.cpp
+src/Image.cpp.o: src/Image.cpp $(IMAGE_HPP)
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-%.cpp.posix32.o: %.cpp
-	$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
+src/ImageAboutWindow.cpp.o: src/ImageAboutWindow.cpp ImageAboutWindow.hpp $(IMAGE_HPP) $(WIDGET_HPP) $(WINDOW_HPP)
+	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-%.cpp.posix64.o: %.cpp
-	$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
+src/ImageButton.cpp.o: src/ImageButton.cpp ImageButton.hpp $(IMAGE_HPP) $(WIDGET_HPP)
+	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-%.cpp.win32.o: %.cpp
-	$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
+src/ImageKnob.cpp.o: src/ImageKnob.cpp ImageKnob.hpp $(IMAGE_HPP) $(WIDGET_HPP)
+	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-%.cpp.win64.o: %.cpp
-	$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
+src/ImageSlider.cpp.o: src/ImageSlider.cpp ImageSlider.hpp $(IMAGE_HPP) $(WIDGET_HPP)
+	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-%.m.o: %.m
-	$(CC) $< $(BUILD_C_FLAGS) -ObjC -c -o $@
+src/ImageSwitch.cpp.o: src/ImageSwitch.cpp ImageSwitch.hpp $(IMAGE_HPP) $(WIDGET_HPP)
+	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-%.mm.o: %.mm
-	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@
+src/NanoVG.cpp.o: src/NanoVG.cpp NanoVG.hpp $(WIDGET_HPP) $(WINDOW_HPP) src/nanovg/*
+	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-# --------------------------------------------------------------
+src/Widget.cpp.o: src/Widget.cpp $(WIDGET_HPP) $(WINDOW_HPP)
+	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-clean:
-	$(RM) src/*.o src/pugl/*.o ../dgl*.a ../libdgl.*
+src/Window.cpp.o: src/Window.cpp $(APP_PRIV_HPP) $(WIDGET_HPP) $(WINDOW_HPP) src/pugl/*
+	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-debug:
-	$(MAKE) DEBUG=true
+src/Window.mm.o: src/Window.mm src/Window.cpp $(APP_PRIV_HPP) $(WIDGET_HPP) $(WINDOW_HPP) src/pugl/*
+	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@
 
 # --------------------------------------------------------------

source/modules/jackbridge/Makefile

@@ -17,6 +17,8 @@ WINE_32BIT_FLAGS = $(32BIT_FLAGS) -L/usr/lib32/wine -L/usr/lib/i386-linux-gnu/wi
 WINE_64BIT_FLAGS = $(64BIT_FLAGS) -L/usr/lib64/wine -L/usr/lib/x86_64-linux-gnu/wine
 WINE_LINK_FLAGS  = $(LINK_FLAGS) -ldl -lrt -lpthread
 
+# --------------------------------------------------------------
+
 OBJS          = JackBridge1.cpp.o          JackBridge2.cpp.o
 OBJS_posix32  = JackBridge1.cpp.posix32.o  JackBridge2.cpp.posix32.o
 OBJS_posix64  = JackBridge1.cpp.posix64.o  JackBridge2.cpp.posix64.o
@@ -47,6 +49,14 @@ wine64:  ../jackbridge-win64.dll.so
 
 # --------------------------------------------------------------
 
+clean:
+	$(RM) *.o ../jackbridge*.a
+
+debug:
+	$(MAKE) DEBUG=true
+
+# --------------------------------------------------------------
+
 ../jackbridge.a: $(OBJS)
 	$(RM) $@
 	$(AR) crs $@ $^
@@ -67,15 +77,6 @@ wine64:  ../jackbridge-win64.dll.so
 	$(RM) $@
 	$(AR) crs $@ $^
 
-../libjackbridge.dll: $(OBJS)
-	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
-
-../libjackbridge.dylib: $(OBJS)
-	$(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@
-
-../libjackbridge.so: $(OBJS)
-	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
-
 # --------------------------------------------------------------
 
 ../jackbridge-posix32e.so: $(OBJS_posix32e)
@@ -130,15 +131,9 @@ wine64:  ../jackbridge-win64.dll.so
 %.wine64.o: %
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -DJACKBRIDGE_EXPORT -c -o $@
 
-%.cpp.o: %.cpp
-	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
-
 # --------------------------------------------------------------
 
-clean:
-	$(RM) *.o ../jackbridge*.a ../libjackbridge.*
-
-debug:
-	$(MAKE) DEBUG=true
+JackBridge%.cpp.o: JackBridge%.cpp JackBridge.hpp
+	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
 # --------------------------------------------------------------

source/modules/juce_audio_basics/Makefile

@@ -9,10 +9,10 @@ include ../../Makefile.mk
 # --------------------------------------------------------------
 
 BUILD_CXX_FLAGS += $(JUCE_AUDIO_BASICS_FLAGS) -I. -w
-LINK_FLAGS      += $(JUCE_AUDIO_BASICS_LIBS) -L.. -ljuce_core
+
+# --------------------------------------------------------------
 
 ifeq ($(MACOS),true)
-BUILD_CXX_FLAGS += -ObjC++
 OBJS         = juce_audio_basics.mm.o
 OBJS_posix32 = juce_audio_basics.mm.posix32.o
 OBJS_posix64 = juce_audio_basics.mm.posix64.o
@@ -21,14 +21,12 @@ OBJS         = juce_audio_basics.cpp.o
 OBJS_posix32 = juce_audio_basics.cpp.posix32.o
 OBJS_posix64 = juce_audio_basics.cpp.posix64.o
 endif
-
-OBJS_win32 = juce_audio_basics.cpp.win32.o
-OBJS_win64 = juce_audio_basics.cpp.win64.o
+OBJS_win32   = juce_audio_basics.cpp.win32.o
+OBJS_win64   = juce_audio_basics.cpp.win64.o
 
 # --------------------------------------------------------------
 
-all: ../juce_audio_basics.a
-
+all:     ../juce_audio_basics.a
 posix32: ../juce_audio_basics.posix32.a
 posix64: ../juce_audio_basics.posix64.a
 win32:   ../juce_audio_basics.win32.a
@@ -36,6 +34,14 @@ win64:   ../juce_audio_basics.win64.a
 
 # --------------------------------------------------------------
 
+clean:
+	$(RM) *.o ../juce_audio_basics*.a
+
+debug:
+	$(MAKE) DEBUG=true
+
+# --------------------------------------------------------------
+
 ../juce_audio_basics.a: $(OBJS)
 	$(RM) $@
 	$(AR) crs $@ $^
@@ -56,41 +62,30 @@ win64:   ../juce_audio_basics.win64.a
 	$(RM) $@
 	$(AR) crs $@ $^
 
-../libjuce_audio_basics.dll: $(OBJS)
-	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
-
-../libjuce_audio_basics.dylib: $(OBJS)
-	$(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@
-
-../libjuce_audio_basics.so: $(OBJS)
-	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
-
 # --------------------------------------------------------------
 
-%.cpp.o: %.cpp *.h */*.cpp */*.h
-	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
+CPP_DEPS = juce_audio_basics.cpp juce_audio_basics.h AppConfig.h */*.cpp */*.h
 
-%.mm.o: %.mm %.cpp *.h */*.cpp */*.h */*.mm
+juce_audio_basics.cpp.o: $(CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-%.posix32.o: %
+juce_audio_basics.cpp.%32.o: $(CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
 
-%.posix64.o: %
+juce_audio_basics.cpp.%64.o: $(CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
 
-%.win32.o: %
-	$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
+# --------------------------------------------------------------
 
-%.win64.o: %
-	$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
+MM_DEPS = juce_audio_basics.mm juce_audio_basics.h AppConfig.h */*.mm */*.cpp */*.h
 
-# --------------------------------------------------------------
+juce_audio_basics.mm.o: $(MM_DEPS)
+	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@
 
-clean:
-	$(RM) *.o ../juce_audio_basics*.a ../libjuce_audio_basics.*
+juce_audio_basics.mm.%32.o: $(MM_DEPS)
+	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ $(32BIT_FLAGS) -c -o $@
 
-debug:
-	$(MAKE) DEBUG=true
+juce_audio_basics.mm.%64.o: $(MM_DEPS)
+	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ $(64BIT_FLAGS) -c -o $@
 
 # --------------------------------------------------------------

source/modules/juce_audio_devices/Makefile

@@ -9,14 +9,14 @@ include ../../Makefile.mk
 # --------------------------------------------------------------
 
 BUILD_CXX_FLAGS += $(JUCE_AUDIO_DEVICES_FLAGS) -I. -w
-LINK_FLAGS      += $(JUCE_AUDIO_DEVICES_LIBS) -L.. -ljuce_events -ljuce_audio_formats -ljuce_audio_basics -ljuce_core
 
 ifeq ($(WIN32),true)
 BUILD_CXX_FLAGS += -I../../includes/asio
 endif
 
+# --------------------------------------------------------------
+
 ifeq ($(MACOS),true)
-BUILD_CXX_FLAGS += -ObjC++
 OBJS         = juce_audio_devices.mm.o
 OBJS_posix32 = juce_audio_devices.mm.posix32.o
 OBJS_posix64 = juce_audio_devices.mm.posix64.o
@@ -25,14 +25,12 @@ OBJS         = juce_audio_devices.cpp.o
 OBJS_posix32 = juce_audio_devices.cpp.posix32.o
 OBJS_posix64 = juce_audio_devices.cpp.posix64.o
 endif
-
-OBJS_win32 = juce_audio_devices.cpp.win32.o
-OBJS_win64 = juce_audio_devices.cpp.win64.o
+OBJS_win32   = juce_audio_devices.cpp.win32.o
+OBJS_win64   = juce_audio_devices.cpp.win64.o
 
 # --------------------------------------------------------------
 
-all: ../juce_audio_devices.a
-
+all:     ../juce_audio_devices.a
 posix32: ../juce_audio_devices.posix32.a
 posix64: ../juce_audio_devices.posix64.a
 win32:   ../juce_audio_devices.win32.a
@@ -40,6 +38,14 @@ win64:   ../juce_audio_devices.win64.a
 
 # --------------------------------------------------------------
 
+clean:
+	$(RM) *.o ../juce_audio_devices*.a
+
+debug:
+	$(MAKE) DEBUG=true
+
+# --------------------------------------------------------------
+
 ../juce_audio_devices.a: $(OBJS)
 	$(RM) $@
 	$(AR) crs $@ $^
@@ -60,41 +66,30 @@ win64:   ../juce_audio_devices.win64.a
 	$(RM) $@
 	$(AR) crs $@ $^
 
-../libjuce_audio_devices.dll: $(OBJS)
-	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
-
-../libjuce_audio_devices.dylib: $(OBJS)
-	$(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@
-
-../libjuce_audio_devices.so: $(OBJS)
-	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
-
 # --------------------------------------------------------------
 
-%.cpp.o: %.cpp *.h */*.cpp */*.h
-	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
+CPP_DEPS = juce_audio_devices.cpp juce_audio_devices.h AppConfig.h */*.cpp */*.h
 
-%.mm.o: %.mm %.cpp *.h */*.cpp */*.h */*.mm
+juce_audio_devices.cpp.o: $(CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-%.posix32.o: %
+juce_audio_devices.cpp.%32.o: $(CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
 
-%.posix64.o: %
+juce_audio_devices.cpp.%64.o: $(CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
 
-%.win32.o: %
-	$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
+# --------------------------------------------------------------
 
-%.win64.o: %
-	$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
+MM_DEPS = juce_audio_devices.mm juce_audio_devices.h AppConfig.h */*.mm */*.cpp */*.h
 
-# --------------------------------------------------------------
+juce_audio_devices.mm.o: $(MM_DEPS)
+	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@
 
-clean:
-	$(RM) *.o ../juce_audio_devices*.a ../libjuce_audio_devices.*
+juce_audio_devices.mm.%32.o: $(MM_DEPS)
+	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ $(32BIT_FLAGS) -c -o $@
 
-debug:
-	$(MAKE) DEBUG=true
+juce_audio_devices.mm.%64.o: $(MM_DEPS)
+	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ $(64BIT_FLAGS) -c -o $@
 
 # --------------------------------------------------------------

source/modules/juce_audio_formats/Makefile

@@ -9,10 +9,10 @@ include ../../Makefile.mk
 # --------------------------------------------------------------
 
 BUILD_CXX_FLAGS += $(JUCE_AUDIO_FORMATS_FLAGS) -I.
-LINK_FLAGS      += $(JUCE_AUDIO_FORMATS_LIBS) -L.. -ljuce_audio_basics -ljuce_core
+
+# --------------------------------------------------------------
 
 ifeq ($(MACOS),true)
-BUILD_CXX_FLAGS += -ObjC++
 OBJS         = juce_audio_formats.mm.o
 OBJS_posix32 = juce_audio_formats.mm.posix32.o
 OBJS_posix64 = juce_audio_formats.mm.posix64.o
@@ -21,14 +21,12 @@ OBJS         = juce_audio_formats.cpp.o
 OBJS_posix32 = juce_audio_formats.cpp.posix32.o
 OBJS_posix64 = juce_audio_formats.cpp.posix64.o
 endif
-
-OBJS_win32 = juce_audio_formats.cpp.win32.o
-OBJS_win64 = juce_audio_formats.cpp.win64.o
+OBJS_win32   = juce_audio_formats.cpp.win32.o
+OBJS_win64   = juce_audio_formats.cpp.win64.o
 
 # --------------------------------------------------------------
 
-all: ../juce_audio_formats.a
-
+all:     ../juce_audio_formats.a
 posix32: ../juce_audio_formats.posix32.a
 posix64: ../juce_audio_formats.posix64.a
 win32:   ../juce_audio_formats.win32.a
@@ -36,6 +34,14 @@ win64:   ../juce_audio_formats.win64.a
 
 # --------------------------------------------------------------
 
+clean:
+	$(RM) *.o ../juce_audio_formats*.a
+
+debug:
+	$(MAKE) DEBUG=true
+
+# --------------------------------------------------------------
+
 ../juce_audio_formats.a: $(OBJS)
 	$(RM) $@
 	$(AR) crs $@ $^
@@ -56,41 +62,30 @@ win64:   ../juce_audio_formats.win64.a
 	$(RM) $@
 	$(AR) crs $@ $^
 
-../libjuce_audio_formats.dll: $(OBJS)
-	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
-
-../libjuce_audio_formats.dylib: $(OBJS)
-	$(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@
-
-../libjuce_audio_formats.so: $(OBJS)
-	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
-
 # --------------------------------------------------------------
 
-%.cpp.o: %.cpp *.h */*.cpp */*.h
-	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
+CPP_DEPS = juce_audio_formats.cpp juce_audio_formats.h AppConfig.h */*.cpp */*.h
 
-%.mm.o: %.mm %.cpp *.h */*.cpp */*.h */*.mm
+juce_audio_formats.cpp.o: $(CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-%.posix32.o: %
+juce_audio_formats.cpp.%32.o: $(CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
 
-%.posix64.o: %
+juce_audio_formats.cpp.%64.o: $(CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
 
-%.win32.o: %
-	$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
+# --------------------------------------------------------------
 
-%.win64.o: %
-	$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
+MM_DEPS = juce_audio_formats.mm juce_audio_formats.h AppConfig.h */*.mm */*.cpp */*.h
 
-# --------------------------------------------------------------
+juce_audio_formats.mm.o: $(MM_DEPS)
+	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@
 
-clean:
-	$(RM) *.o ../juce_audio_formats*.a ../libjuce_audio_formats.*
+juce_audio_formats.mm.%32.o: $(MM_DEPS)
+	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ $(32BIT_FLAGS) -c -o $@
 
-debug:
-	$(MAKE) DEBUG=true
+juce_audio_formats.mm.%64.o: $(MM_DEPS)
+	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ $(64BIT_FLAGS) -c -o $@
 
 # --------------------------------------------------------------

source/modules/juce_audio_processors/Makefile

@@ -9,7 +9,6 @@ include ../../Makefile.mk
 # --------------------------------------------------------------
 
 BUILD_CXX_FLAGS += $(JUCE_AUDIO_PROCESSORS_FLAGS) -I. -I../../includes/ladspa -I../../includes/vst -I../../includes/vst3 -w
-LINK_FLAGS      += $(JUCE_AUDIO_PROCESSORS_LIBS) -L.. -ljuce_gui_extra -ljuce_gui_basics -ljuce_graphics -ljuce_data_structures -ljuce_events -ljuce_audio_basics -ljuce_core
 
 ifeq ($(CARLA_VESTIGE_HEADER),true)
 BUILD_CXX_FLAGS += -DVESTIGE_HEADER
@@ -23,8 +22,9 @@ BUILD_CXX_FLAGS += -DRELEASE
 endif
 endif
 
+# --------------------------------------------------------------
+
 ifeq ($(MACOS),true)
-BUILD_CXX_FLAGS += -ObjC++
 OBJS         = juce_audio_processors.mm.o
 OBJS_posix32 = juce_audio_processors.mm.posix32.o
 OBJS_posix64 = juce_audio_processors.mm.posix64.o
@@ -33,14 +33,12 @@ OBJS         = juce_audio_processors.cpp.o
 OBJS_posix32 = juce_audio_processors.cpp.posix32.o
 OBJS_posix64 = juce_audio_processors.cpp.posix64.o
 endif
-
-OBJS_win32 = juce_audio_processors.cpp.win32.o
-OBJS_win64 = juce_audio_processors.cpp.win64.o
+OBJS_win32   = juce_audio_processors.cpp.win32.o
+OBJS_win64   = juce_audio_processors.cpp.win64.o
 
 # --------------------------------------------------------------
 
-all: ../juce_audio_processors.a
-
+all:     ../juce_audio_processors.a
 posix32: ../juce_audio_processors.posix32.a
 posix64: ../juce_audio_processors.posix64.a
 win32:   ../juce_audio_processors.win32.a
@@ -48,6 +46,14 @@ win64:   ../juce_audio_processors.win64.a
 
 # --------------------------------------------------------------
 
+clean:
+	$(RM) *.o ../juce_audio_processors*.a
+
+debug:
+	$(MAKE) DEBUG=true
+
+# --------------------------------------------------------------
+
 ../juce_audio_processors.a: $(OBJS)
 	$(RM) $@
 	$(AR) crs $@ $^
@@ -68,41 +74,30 @@ win64:   ../juce_audio_processors.win64.a
 	$(RM) $@
 	$(AR) crs $@ $^
 
-../libjuce_audio_processors.dll: $(OBJS)
-	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
-
-../libjuce_audio_processors.dylib: $(OBJS)
-	$(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@
-
-../libjuce_audio_processors.so: $(OBJS)
-	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
-
 # --------------------------------------------------------------
 
-%.cpp.o: %.cpp *.h */*.cpp */*.h
-	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
+CPP_DEPS = juce_audio_processors.cpp juce_audio_processors.h AppConfig.h */*.cpp */*.h
 
-%.mm.o: %.mm %.cpp *.h */*.cpp */*.h */*.mm
+juce_audio_processors.cpp.o: $(CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-%.posix32.o: %
+juce_audio_processors.cpp.%32.o: $(CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
 
-%.posix64.o: %
+juce_audio_processors.cpp.%64.o: $(CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
 
-%.win32.o: %
-	$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
+# --------------------------------------------------------------
 
-%.win64.o: %
-	$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
+MM_DEPS = juce_audio_processors.mm juce_audio_processors.h AppConfig.h */*.mm */*.cpp */*.h
 
-# --------------------------------------------------------------
+juce_audio_processors.mm.o: $(MM_DEPS)
+	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@
 
-clean:
-	$(RM) *.o ../juce_audio_processors*.a ../libjuce_audio_processors.*
+juce_audio_processors.mm.%32.o: $(MM_DEPS)
+	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ $(32BIT_FLAGS) -c -o $@
 
-debug:
-	$(MAKE) DEBUG=true
+juce_audio_processors.mm.%64.o: $(MM_DEPS)
+	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ $(64BIT_FLAGS) -c -o $@
 
 # --------------------------------------------------------------

source/modules/juce_core/Makefile

@@ -9,10 +9,10 @@ include ../../Makefile.mk
 # --------------------------------------------------------------
 
 BUILD_CXX_FLAGS += $(JUCE_CORE_FLAGS) -I. -w
-LINK_FLAGS      += $(JUCE_CORE_LIBS)
+
+# --------------------------------------------------------------
 
 ifeq ($(MACOS),true)
-BUILD_CXX_FLAGS += -ObjC++
 OBJS         = juce_core.mm.o
 OBJS_posix32 = juce_core.mm.posix32.o
 OBJS_posix64 = juce_core.mm.posix64.o
@@ -21,14 +21,12 @@ OBJS         = juce_core.cpp.o
 OBJS_posix32 = juce_core.cpp.posix32.o
 OBJS_posix64 = juce_core.cpp.posix64.o
 endif
-
-OBJS_win32 = juce_core.cpp.win32.o
-OBJS_win64 = juce_core.cpp.win64.o
+OBJS_win32   = juce_core.cpp.win32.o
+OBJS_win64   = juce_core.cpp.win64.o
 
 # --------------------------------------------------------------
 
-all: ../juce_core.a
-
+all:     ../juce_core.a
 posix32: ../juce_core.posix32.a
 posix64: ../juce_core.posix64.a
 win32:   ../juce_core.win32.a
@@ -36,6 +34,14 @@ win64:   ../juce_core.win64.a
 
 # --------------------------------------------------------------
 
+clean:
+	$(RM) *.o ../juce_core*.a
+
+debug:
+	$(MAKE) DEBUG=true
+
+# --------------------------------------------------------------
+
 ../juce_core.a: $(OBJS)
 	$(RM) $@
 	$(AR) crs $@ $^
@@ -56,41 +62,30 @@ win64:   ../juce_core.win64.a
 	$(RM) $@
 	$(AR) crs $@ $^
 
-../libjuce_core.dll: $(OBJS)
-	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
-
-../libjuce_core.dylib: $(OBJS)
-	$(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@
-
-../libjuce_core.so: $(OBJS)
-	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
-
 # --------------------------------------------------------------
 
-%.cpp.o: %.cpp *.h */*.cpp */*.h
-	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
+CPP_DEPS = juce_core.cpp juce_core.h AppConfig.h */*.cpp */*.h
 
-%.mm.o: %.mm %.cpp *.h */*.cpp */*.h */*.mm
+juce_core.cpp.o: $(CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-%.posix32.o: %
+juce_core.cpp.%32.o: $(CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
 
-%.posix64.o: %
+juce_core.cpp.%64.o: $(CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
 
-%.win32.o: %
-	$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
+# --------------------------------------------------------------
 
-%.win64.o: %
-	$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
+MM_DEPS = juce_core.mm juce_core.h AppConfig.h */*.mm */*.cpp */*.h
 
-# --------------------------------------------------------------
+juce_core.mm.o: $(MM_DEPS)
+	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@
 
-clean:
-	$(RM) *.o ../juce_core*.a ../libjuce_core.*
+juce_core.mm.%32.o: $(MM_DEPS)
+	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ $(32BIT_FLAGS) -c -o $@
 
-debug:
-	$(MAKE) DEBUG=true
+juce_core.mm.%64.o: $(MM_DEPS)
+	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ $(64BIT_FLAGS) -c -o $@
 
 # --------------------------------------------------------------

source/modules/juce_data_structures/Makefile

@@ -9,10 +9,10 @@ include ../../Makefile.mk
 # --------------------------------------------------------------
 
 BUILD_CXX_FLAGS += $(JUCE_DATA_STRUCTURES_FLAGS) -I. -w
-LINK_FLAGS      += $(JUCE_DATA_STRUCTURES_LIBS) -L.. -ljuce_events -ljuce_core
+
+# --------------------------------------------------------------
 
 ifeq ($(MACOS),true)
-BUILD_CXX_FLAGS += -ObjC++
 OBJS         = juce_data_structures.mm.o
 OBJS_posix32 = juce_data_structures.mm.posix32.o
 OBJS_posix64 = juce_data_structures.mm.posix64.o
@@ -21,14 +21,12 @@ OBJS         = juce_data_structures.cpp.o
 OBJS_posix32 = juce_data_structures.cpp.posix32.o
 OBJS_posix64 = juce_data_structures.cpp.posix64.o
 endif
-
-OBJS_win32 = juce_data_structures.cpp.win32.o
-OBJS_win64 = juce_data_structures.cpp.win64.o
+OBJS_win32   = juce_data_structures.cpp.win32.o
+OBJS_win64   = juce_data_structures.cpp.win64.o
 
 # --------------------------------------------------------------
 
-all: ../juce_data_structures.a
-
+all:     ../juce_data_structures.a
 posix32: ../juce_data_structures.posix32.a
 posix64: ../juce_data_structures.posix64.a
 win32:   ../juce_data_structures.win32.a
@@ -36,6 +34,14 @@ win64:   ../juce_data_structures.win64.a
 
 # --------------------------------------------------------------
 
+clean:
+	$(RM) *.o ../juce_data_structures*.a
+
+debug:
+	$(MAKE) DEBUG=true
+
+# --------------------------------------------------------------
+
 ../juce_data_structures.a: $(OBJS)
 	$(RM) $@
 	$(AR) crs $@ $^
@@ -56,41 +62,30 @@ win64:   ../juce_data_structures.win64.a
 	$(RM) $@
 	$(AR) crs $@ $^
 
-../libjuce_data_structures.dll: $(OBJS)
-	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
-
-../libjuce_data_structures.dylib: $(OBJS)
-	$(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@
-
-../libjuce_data_structures.so: $(OBJS)
-	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
-
 # --------------------------------------------------------------
 
-%.cpp.o: %.cpp *.h */*.cpp */*.h
-	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
+CPP_DEPS = juce_data_structures.cpp juce_data_structures.h AppConfig.h */*.cpp */*.h
 
-%.mm.o: %.mm %.cpp *.h */*.cpp */*.h */*.mm
+juce_data_structures.cpp.o: $(CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-%.posix32.o: %
+juce_data_structures.cpp.%32.o: $(CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
 
-%.posix64.o: %
+juce_data_structures.cpp.%64.o: $(CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
 
-%.win32.o: %
-	$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
+# --------------------------------------------------------------
 
-%.win64.o: %
-	$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
+MM_DEPS = juce_data_structures.mm juce_data_structures.h AppConfig.h */*.mm */*.cpp */*.h
 
-# --------------------------------------------------------------
+juce_data_structures.mm.o: $(MM_DEPS)
+	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@
 
-clean:
-	$(RM) *.o ../juce_data_structures*.a ../libjuce_data_structures.*
+juce_data_structures.mm.%32.o: $(MM_DEPS)
+	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ $(32BIT_FLAGS) -c -o $@
 
-debug:
-	$(MAKE) DEBUG=true
+juce_data_structures.mm.%64.o: $(MM_DEPS)
+	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ $(64BIT_FLAGS) -c -o $@
 
 # --------------------------------------------------------------

source/modules/juce_events/Makefile

@@ -9,10 +9,10 @@ include ../../Makefile.mk
 # --------------------------------------------------------------
 
 BUILD_CXX_FLAGS += $(JUCE_EVENTS_FLAGS) -I. -w
-LINK_FLAGS      += $(JUCE_EVENTS_LIBS) -L.. -ljuce_core
+
+# --------------------------------------------------------------
 
 ifeq ($(MACOS),true)
-BUILD_CXX_FLAGS += -ObjC++
 OBJS         = juce_events.mm.o
 OBJS_posix32 = juce_events.mm.posix32.o
 OBJS_posix64 = juce_events.mm.posix64.o
@@ -21,14 +21,12 @@ OBJS         = juce_events.cpp.o
 OBJS_posix32 = juce_events.cpp.posix32.o
 OBJS_posix64 = juce_events.cpp.posix64.o
 endif
-
-OBJS_win32 = juce_events.cpp.win32.o
-OBJS_win64 = juce_events.cpp.win64.o
+OBJS_win32   = juce_events.cpp.win32.o
+OBJS_win64   = juce_events.cpp.win64.o
 
 # --------------------------------------------------------------
 
-all: ../juce_events.a
-
+all:     ../juce_events.a
 posix32: ../juce_events.posix32.a
 posix64: ../juce_events.posix64.a
 win32:   ../juce_events.win32.a
@@ -36,6 +34,14 @@ win64:   ../juce_events.win64.a
 
 # --------------------------------------------------------------
 
+clean:
+	$(RM) *.o ../juce_events*.a
+
+debug:
+	$(MAKE) DEBUG=true
+
+# --------------------------------------------------------------
+
 ../juce_events.a: $(OBJS)
 	$(RM) $@
 	$(AR) crs $@ $^
@@ -56,41 +62,30 @@ win64:   ../juce_events.win64.a
 	$(RM) $@
 	$(AR) crs $@ $^
 
-../libjuce_events.dll: $(OBJS)
-	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
-
-../libjuce_events.dylib: $(OBJS)
-	$(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@
-
-../libjuce_events.so: $(OBJS)
-	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
-
 # --------------------------------------------------------------
 
-%.cpp.o: %.cpp *.h */*.cpp */*.h
-	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
+CPP_DEPS = juce_events.cpp juce_events.h AppConfig.h */*.cpp */*.h
 
-%.mm.o: %.mm %.cpp *.h */*.cpp */*.h */*.mm
+juce_events.cpp.o: $(CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-%.posix32.o: %
+juce_events.cpp.%32.o: $(CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
 
-%.posix64.o: %
+juce_events.cpp.%64.o: $(CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
 
-%.win32.o: %
-	$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
+# --------------------------------------------------------------
 
-%.win64.o: %
-	$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
+MM_DEPS = juce_events.mm juce_events.h AppConfig.h */*.mm */*.cpp */*.h
 
-# --------------------------------------------------------------
+juce_events.mm.o: $(MM_DEPS)
+	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@
 
-clean:
-	$(RM) *.o ../juce_events*.a ../libjuce_events.*
+juce_events.mm.%32.o: $(MM_DEPS)
+	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ $(32BIT_FLAGS) -c -o $@
 
-debug:
-	$(MAKE) DEBUG=true
+juce_events.mm.%64.o: $(MM_DEPS)
+	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ $(64BIT_FLAGS) -c -o $@
 
 # --------------------------------------------------------------

source/modules/juce_graphics/Makefile

@@ -9,10 +9,10 @@ include ../../Makefile.mk
 # --------------------------------------------------------------
 
 BUILD_CXX_FLAGS += $(JUCE_GRAPHICS_FLAGS) -I. -w
-LINK_FLAGS      += $(JUCE_GRAPHICS_LIBS) -L.. -ljuce_events -ljuce_core
+
+# --------------------------------------------------------------
 
 ifeq ($(MACOS),true)
-BUILD_CXX_FLAGS += -ObjC++
 OBJS         = juce_graphics.mm.o
 OBJS_posix32 = juce_graphics.mm.posix32.o
 OBJS_posix64 = juce_graphics.mm.posix64.o
@@ -21,14 +21,12 @@ OBJS         = juce_graphics.cpp.o
 OBJS_posix32 = juce_graphics.cpp.posix32.o
 OBJS_posix64 = juce_graphics.cpp.posix64.o
 endif
-
-OBJS_win32 = juce_graphics.cpp.win32.o
-OBJS_win64 = juce_graphics.cpp.win64.o
+OBJS_win32   = juce_graphics.cpp.win32.o
+OBJS_win64   = juce_graphics.cpp.win64.o
 
 # --------------------------------------------------------------
 
-all: ../juce_graphics.a
-
+all:     ../juce_graphics.a
 posix32: ../juce_graphics.posix32.a
 posix64: ../juce_graphics.posix64.a
 win32:   ../juce_graphics.win32.a
@@ -36,6 +34,14 @@ win64:   ../juce_graphics.win64.a
 
 # --------------------------------------------------------------
 
+clean:
+	$(RM) *.o ../juce_graphics*.a
+
+debug:
+	$(MAKE) DEBUG=true
+
+# --------------------------------------------------------------
+
 ../juce_graphics.a: $(OBJS)
 	$(RM) $@
 	$(AR) crs $@ $^
@@ -56,41 +62,30 @@ win64:   ../juce_graphics.win64.a
 	$(RM) $@
 	$(AR) crs $@ $^
 
-../libjuce_graphics.dll: $(OBJS)
-	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
-
-../libjuce_graphics.dylib: $(OBJS)
-	$(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@
-
-../libjuce_graphics.so: $(OBJS)
-	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
-
 # --------------------------------------------------------------
 
-%.cpp.o: %.cpp *.h */*.cpp */*.h
-	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
+CPP_DEPS = juce_graphics.cpp juce_graphics.h AppConfig.h */*.cpp */*.h
 
-%.mm.o: %.mm %.cpp *.h */*.cpp */*.h */*.mm
+juce_graphics.cpp.o: $(CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-%.posix32.o: %
+juce_graphics.cpp.%32.o: $(CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
 
-%.posix64.o: %
+juce_graphics.cpp.%64.o: $(CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
 
-%.win32.o: %
-	$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
+# --------------------------------------------------------------
 
-%.win64.o: %
-	$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
+MM_DEPS = juce_graphics.mm juce_graphics.h AppConfig.h */*.mm */*.cpp */*.h
 
-# --------------------------------------------------------------
+juce_graphics.mm.o: $(MM_DEPS)
+	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@
 
-clean:
-	$(RM) *.o ../juce_graphics*.a ../libjuce_graphics.*
+juce_graphics.mm.%32.o: $(MM_DEPS)
+	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ $(32BIT_FLAGS) -c -o $@
 
-debug:
-	$(MAKE) DEBUG=true
+juce_graphics.mm.%64.o: $(MM_DEPS)
+	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ $(64BIT_FLAGS) -c -o $@
 
 # --------------------------------------------------------------

source/modules/juce_gui_basics/Makefile

@@ -9,10 +9,10 @@ include ../../Makefile.mk
 # --------------------------------------------------------------
 
 BUILD_CXX_FLAGS += $(JUCE_GUI_BASICS_FLAGS) -I. -w
-LINK_FLAGS      += $(JUCE_GUI_BASICS_LIBS) -L.. -ljuce_graphics -ljuce_data_structures -ljuce_events -ljuce_core
+
+# --------------------------------------------------------------
 
 ifeq ($(MACOS),true)
-BUILD_CXX_FLAGS += -ObjC++
 OBJS         = juce_gui_basics.mm.o
 OBJS_posix32 = juce_gui_basics.mm.posix32.o
 OBJS_posix64 = juce_gui_basics.mm.posix64.o
@@ -21,14 +21,12 @@ OBJS         = juce_gui_basics.cpp.o
 OBJS_posix32 = juce_gui_basics.cpp.posix32.o
 OBJS_posix64 = juce_gui_basics.cpp.posix64.o
 endif
-
-OBJS_win32 = juce_gui_basics.cpp.win32.o
-OBJS_win64 = juce_gui_basics.cpp.win64.o
+OBJS_win32   = juce_gui_basics.cpp.win32.o
+OBJS_win64   = juce_gui_basics.cpp.win64.o
 
 # --------------------------------------------------------------
 
-all: ../juce_gui_basics.a
-
+all:     ../juce_gui_basics.a
 posix32: ../juce_gui_basics.posix32.a
 posix64: ../juce_gui_basics.posix64.a
 win32:   ../juce_gui_basics.win32.a
@@ -36,6 +34,14 @@ win64:   ../juce_gui_basics.win64.a
 
 # --------------------------------------------------------------
 
+clean:
+	$(RM) *.o ../juce_gui_basics*.a
+
+debug:
+	$(MAKE) DEBUG=true
+
+# --------------------------------------------------------------
+
 ../juce_gui_basics.a: $(OBJS)
 	$(RM) $@
 	$(AR) crs $@ $^
@@ -56,41 +62,30 @@ win64:   ../juce_gui_basics.win64.a
 	$(RM) $@
 	$(AR) crs $@ $^
 
-../libjuce_gui_basics.dll: $(OBJS)
-	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
-
-../libjuce_gui_basics.dylib: $(OBJS)
-	$(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@
-
-../libjuce_gui_basics.so: $(OBJS)
-	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
-
 # --------------------------------------------------------------
 
-%.cpp.o: %.cpp *.h */*.cpp */*.h
-	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
+CPP_DEPS = juce_gui_basics.cpp juce_gui_basics.h AppConfig.h */*.cpp */*.h
 
-%.mm.o: %.mm %.cpp *.h */*.cpp */*.h */*.mm
+juce_gui_basics.cpp.o: $(CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-%.posix32.o: %
+juce_gui_basics.cpp.%32.o: $(CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
 
-%.posix64.o: %
+juce_gui_basics.cpp.%64.o: $(CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
 
-%.win32.o: %
-	$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
+# --------------------------------------------------------------
 
-%.win64.o: %
-	$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
+MM_DEPS = juce_gui_basics.mm juce_gui_basics.h AppConfig.h */*.mm */*.cpp */*.h
 
-# --------------------------------------------------------------
+juce_gui_basics.mm.o: $(MM_DEPS)
+	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@
 
-clean:
-	$(RM) *.o ../juce_gui_basics*.a ../libjuce_gui_basics.*
+juce_gui_basics.mm.%32.o: $(MM_DEPS)
+	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ $(32BIT_FLAGS) -c -o $@
 
-debug:
-	$(MAKE) DEBUG=true
+juce_gui_basics.mm.%64.o: $(MM_DEPS)
+	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ $(64BIT_FLAGS) -c -o $@
 
 # --------------------------------------------------------------

source/modules/juce_gui_extra/Makefile

@@ -9,10 +9,10 @@ include ../../Makefile.mk
 # --------------------------------------------------------------
 
 BUILD_CXX_FLAGS += $(JUCE_GUI_EXTRA_FLAGS) -I. -w
-LINK_FLAGS      += $(JUCE_GUI_EXTRA_LIBS) -L.. -ljuce_gui_basics -ljuce_graphics -ljuce_data_structures -ljuce_events -ljuce_core
+
+# --------------------------------------------------------------
 
 ifeq ($(MACOS),true)
-BUILD_CXX_FLAGS += -ObjC++
 OBJS         = juce_gui_extra.mm.o
 OBJS_posix32 = juce_gui_extra.mm.posix32.o
 OBJS_posix64 = juce_gui_extra.mm.posix64.o
@@ -21,14 +21,12 @@ OBJS         = juce_gui_extra.cpp.o
 OBJS_posix32 = juce_gui_extra.cpp.posix32.o
 OBJS_posix64 = juce_gui_extra.cpp.posix64.o
 endif
-
-OBJS_win32 = juce_gui_extra.cpp.win32.o
-OBJS_win64 = juce_gui_extra.cpp.win64.o
+OBJS_win32   = juce_gui_extra.cpp.win32.o
+OBJS_win64   = juce_gui_extra.cpp.win64.o
 
 # --------------------------------------------------------------
 
-all: ../juce_gui_extra.a
-
+all:     ../juce_gui_extra.a
 posix32: ../juce_gui_extra.posix32.a
 posix64: ../juce_gui_extra.posix64.a
 win32:   ../juce_gui_extra.win32.a
@@ -36,6 +34,14 @@ win64:   ../juce_gui_extra.win64.a
 
 # --------------------------------------------------------------
 
+clean:
+	$(RM) *.o ../juce_gui_extra*.a
+
+debug:
+	$(MAKE) DEBUG=true
+
+# --------------------------------------------------------------
+
 ../juce_gui_extra.a: $(OBJS)
 	$(RM) $@
 	$(AR) crs $@ $^
@@ -56,41 +62,30 @@ win64:   ../juce_gui_extra.win64.a
 	$(RM) $@
 	$(AR) crs $@ $^
 
-../libjuce_gui_extra.dll: $(OBJS)
-	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
-
-../libjuce_gui_extra.dylib: $(OBJS)
-	$(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@
-
-../libjuce_gui_extra.so: $(OBJS)
-	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
-
 # --------------------------------------------------------------
 
-%.cpp.o: %.cpp *.h */*.cpp */*.h
-	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
+CPP_DEPS = juce_gui_extra.cpp juce_gui_extra.h AppConfig.h */*.cpp */*.h
 
-%.mm.o: %.mm %.cpp *.h */*.cpp */*.h */*.mm
+juce_gui_extra.cpp.o: $(CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-%.posix32.o: %
+juce_gui_extra.cpp.%32.o: $(CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
 
-%.posix64.o: %
+juce_gui_extra.cpp.%64.o: $(CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
 
-%.win32.o: %
-	$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
+# --------------------------------------------------------------
 
-%.win64.o: %
-	$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
+MM_DEPS = juce_gui_extra.mm juce_gui_extra.h AppConfig.h */*.mm */*.cpp */*.h
 
-# --------------------------------------------------------------
+juce_gui_extra.mm.o: $(MM_DEPS)
+	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@
 
-clean:
-	$(RM) *.o ../juce_gui_extra*.a ../libjuce_gui_extra.*
+juce_gui_extra.mm.%32.o: $(MM_DEPS)
+	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ $(32BIT_FLAGS) -c -o $@
 
-debug:
-	$(MAKE) DEBUG=true
+juce_gui_extra.mm.%64.o: $(MM_DEPS)
+	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ $(64BIT_FLAGS) -c -o $@
 
 # --------------------------------------------------------------

source/modules/lilv/Makefile

@@ -13,9 +13,13 @@ SORD_VERSION   = 0.12.0
 SRATOM_VERSION = 0.4.4
 LILV_VERSION   = 0.18.0
 
+# --------------------------------------------------------------
+
 BUILD_C_FLAGS += $(LILV_FLAGS) -Iconfig -I../../includes -w
 LINK_FLAGS    += $(LILV_LIBS)
 
+# --------------------------------------------------------------
+
 OBJS         = serd.c.o         sord.c.o         sratom.c.o         lilv.c.o
 OBJS_posix32 = serd.c.posix32.o sord.c.posix32.o sratom.c.posix32.o lilv.c.posix32.o
 OBJS_posix64 = serd.c.posix64.o sord.c.posix64.o sratom.c.posix64.o lilv.c.posix64.o
@@ -24,8 +28,7 @@ OBJS_win64   = serd.c.win64.o   sord.c.win64.o   sratom.c.win64.o   lilv.c.win64
 
 # --------------------------------------------------------------
 
-all: ../lilv.a
-
+all:     ../lilv.a
 posix32: ../lilv.posix32.a
 posix64: ../lilv.posix64.a
 win32:   ../lilv.win32.a
@@ -33,6 +36,14 @@ win64:   ../lilv.win64.a
 
 # --------------------------------------------------------------
 
+clean:
+	$(RM) *.o ../lilv*.a
+
+debug:
+	$(MAKE) DEBUG=true
+
+# --------------------------------------------------------------
+
 ../lilv.a: $(OBJS)
 	$(RM) $@
 	$(AR) crs $@ $^
@@ -53,63 +64,56 @@ win64:   ../lilv.win64.a
 	$(RM) $@
 	$(AR) crs $@ $^
 
-../liblilv.dll: $(OBJS)
-	$(CC) $^ -shared $(LINK_FLAGS) -o $@
+# --------------------------------------------------------------
+
+SERD_DEPS = serd.c serd-$(SERD_VERSION)/src/* serd-$(SERD_VERSION)/serd/serd.h
+
+serd.c.o: $(SERD_DEPS)
+	$(CC) $< $(BUILD_C_FLAGS) -Iserd-$(SERD_VERSION) -c -o $@
 
-../liblilv.dylib: $(OBJS)
-	$(CC) $^ -dynamiclib $(LINK_FLAGS) -o $@
+serd.c.%32.o: $(SERD_DEPS)
+	$(CC) $< $(BUILD_C_FLAGS) -Iserd-$(SERD_VERSION) $(32BIT_FLAGS) -c -o $@
 
-../liblilv.so: $(OBJS)
-	$(CC) $^ -shared $(LINK_FLAGS) -o $@
+serd.c.%64.o: $(SERD_DEPS)
+	$(CC) $< $(BUILD_C_FLAGS) -Iserd-$(SERD_VERSION) $(64BIT_FLAGS) -c -o $@
 
 # --------------------------------------------------------------
 
-serd.c.o: serd.c
-	$(CC) $< $(BUILD_C_FLAGS) -Iserd-$(SERD_VERSION) -c -o $@
+SORD_DEPS = sord.c sord-$(SORD_VERSION)/src/* sord-$(SORD_VERSION)/sord/sord.h
 
-sord.c.o: sord.c
+sord.c.o: $(SORD_DEPS)
 	$(CC) $< $(BUILD_C_FLAGS) -Isord-$(SORD_VERSION) -Isord-$(SORD_VERSION)/src -c -o $@
 
-sratom.c.o: sratom.c
-	$(CC) $< $(BUILD_C_FLAGS) -Isratom-$(SRATOM_VERSION) -c -o $@
+sord.c.%32.o: $(SORD_DEPS)
+	$(CC) $< $(BUILD_C_FLAGS) -Isord-$(SORD_VERSION) -Isord-$(SORD_VERSION)/src $(32BIT_FLAGS) -c -o $@
 
-lilv.c.o: lilv.c
-	$(CC) $< $(BUILD_C_FLAGS) -Ililv-$(LILV_VERSION) -Ililv-$(LILV_VERSION)/src -c -o $@
+sord.c.%64.o: $(SORD_DEPS)
+	$(CC) $< $(BUILD_C_FLAGS) -Isord-$(SORD_VERSION) -Isord-$(SORD_VERSION)/src $(64BIT_FLAGS) -c -o $@
 
 # --------------------------------------------------------------
 
-serd.c.%32.o: serd.c
-	$(CC) $< $(BUILD_C_FLAGS) -Iserd-$(SERD_VERSION) $(32BIT_FLAGS) -c -o $@
+SRATOM_DEPS = sratom.c sratom-$(SRATOM_VERSION)/src/* sratom-$(SRATOM_VERSION)/sratom/sratom.h
 
-sord.c.%32.o: sord.c
-	$(CC) $< $(BUILD_C_FLAGS) -Isord-$(SORD_VERSION) -Isord-$(SORD_VERSION)/src $(32BIT_FLAGS) -c -o $@
+sratom.c.o: $(SRATOM_DEPS)
+	$(CC) $< $(BUILD_C_FLAGS) -Isratom-$(SRATOM_VERSION) -c -o $@
 
-sratom.c.%32.o: sratom.c
+sratom.c.%32.o: $(SRATOM_DEPS)
 	$(CC) $< $(BUILD_C_FLAGS) -Isratom-$(SRATOM_VERSION) $(32BIT_FLAGS) -c -o $@
 
-lilv.c.%32.o: lilv.c
-	$(CC) $< $(BUILD_C_FLAGS) -Ililv-$(LILV_VERSION) -Ililv-$(LILV_VERSION)/src $(32BIT_FLAGS) -c -o $@
+sratom.c.%64.o: $(SRATOM_DEPS)
+	$(CC) $< $(BUILD_C_FLAGS) -Isratom-$(SRATOM_VERSION) $(64BIT_FLAGS) -c -o $@
 
 # --------------------------------------------------------------
 
-serd.c.%64.o: serd.c
-	$(CC) $< $(BUILD_C_FLAGS) -Iserd-$(SERD_VERSION) $(64BIT_FLAGS) -c -o $@
+LILV_DEPS = lilv.c lilv-$(LILV_VERSION)/src/* lilv-$(LILV_VERSION)/src/zix/* lilv-$(LILV_VERSION)/lilv/lilv.h
 
-sord.c.%64.o: sord.c
-	$(CC) $< $(BUILD_C_FLAGS) -Isord-$(SORD_VERSION) -Isord-$(SORD_VERSION)/src $(64BIT_FLAGS) -c -o $@
+lilv.c.o: $(LILV_DEPS)
+	$(CC) $< $(BUILD_C_FLAGS) -Ililv-$(LILV_VERSION) -Ililv-$(LILV_VERSION)/src -c -o $@
 
-sratom.c.%64.o: sratom.c
-	$(CC) $< $(BUILD_C_FLAGS) -Isratom-$(SRATOM_VERSION) $(64BIT_FLAGS) -c -o $@
+lilv.c.%32.o: $(LILV_DEPS)
+	$(CC) $< $(BUILD_C_FLAGS) -Ililv-$(LILV_VERSION) -Ililv-$(LILV_VERSION)/src $(32BIT_FLAGS) -c -o $@
 
-lilv.c.%64.o: lilv.c
+lilv.c.%64.o: $(LILV_DEPS)
 	$(CC) $< $(BUILD_C_FLAGS) -Ililv-$(LILV_VERSION) -Ililv-$(LILV_VERSION)/src $(64BIT_FLAGS) -c -o $@
 
 # --------------------------------------------------------------
-
-clean:
-	$(RM) *.o ../lilv*.a ../liblilv.*
-
-debug:
-	$(MAKE) DEBUG=true
-
-# --------------------------------------------------------------

source/modules/native-plugins/Makefile

@@ -209,15 +209,6 @@ all: ../native-plugins.a
 	$(RM) $@
 	$(AR) crs $@ $^
 
-../libnative-plugins.dll: $(OBJS)
-	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
-
-../libnative-plugins.dylib: $(OBJS)
-	$(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@
-
-../libnative-plugins.so: $(OBJS)
-	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
-
 # --------------------------------------------------------------
 
 CDEPS   = ../CarlaNative.h

source/modules/rtaudio/Makefile

@@ -9,9 +9,11 @@ include ../../Makefile.mk
 # --------------------------------------------------------------
 
 BUILD_CXX_FLAGS += $(RTAUDIO_FLAGS) -I. -Iinclude -I.. -I../../includes
-LINK_FLAGS      += $(RTAUDIO_LIBS) -L.. -ljackbridge
 
-OBJS = RtAudio.cpp.o
+# --------------------------------------------------------------
+
+OBJS = \
+	RtAudio.cpp.o
 
 ifeq ($(WIN32),true)
 OBJS += \
@@ -21,36 +23,31 @@ OBJS += \
 	include/iasiothiscallresolver.cpp.o
 endif
 
-# --------------------------------------------------------------
-
-all: ../rtaudio.a
+TARGETS = \
+	../rtaudio.a
 
 # --------------------------------------------------------------
 
-../rtaudio.a: $(OBJS)
-	$(RM) $@
-	$(AR) crs $@ $^
+all: $(TARGETS)
 
-../librtaudio.dll: $(OBJS)
-	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
+# --------------------------------------------------------------
 
-../librtaudio.dylib: $(OBJS)
-	$(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@
+clean:
+	$(RM) $(OBJS)
+	$(RM) $(TARGETS)
 
-../librtaudio.so: $(OBJS)
-	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
+debug:
+	$(MAKE) DEBUG=true
 
 # --------------------------------------------------------------
 
-%.cpp.o: %.cpp
-	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
+../rtaudio.a: $(OBJS)
+	$(RM) $@
+	$(AR) crs $@ $^
 
 # --------------------------------------------------------------
 
-clean:
-	$(RM) *.o ../rtaudio*.a ../librtaudio.*
-
-debug:
-	$(MAKE) DEBUG=true
+RtAudio.cpp.o: RtAudio.cpp RtAudio.h RtError.h
+	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
 # --------------------------------------------------------------

source/modules/rtmempool/Makefile

@@ -9,12 +9,13 @@ include ../../Makefile.mk
 # --------------------------------------------------------------
 
 BUILD_C_FLAGS += $(RTMEMPOOL_FLAGS) -I. -I../../includes
-LINK_FLAGS    += $(RTMEMPOOL_LIBS)
 
 ifeq ($(CARLA_PLUGIN_SUPPORT),true)
 BUILD_C_FLAGS += -DWANT_LV2
 endif
 
+# --------------------------------------------------------------
+
 OBJS         = rtmempool.c.o
 OBJS_posix32 = rtmempool.c.posix32.o
 OBJS_posix64 = rtmempool.c.posix64.o
@@ -23,8 +24,7 @@ OBJS_win64   = rtmempool.c.win64.o
 
 # --------------------------------------------------------------
 
-all: ../rtmempool.a
-
+all:     ../rtmempool.a
 posix32: ../rtmempool.posix32.a
 posix64: ../rtmempool.posix64.a
 win32:   ../rtmempool.win32.a
@@ -32,6 +32,14 @@ win64:   ../rtmempool.win64.a
 
 # --------------------------------------------------------------
 
+clean:
+	$(RM) *.o ../rtmempool*.a
+
+debug:
+	$(MAKE) DEBUG=true
+
+# --------------------------------------------------------------
+
 ../rtmempool.a: $(OBJS)
 	$(RM) $@
 	$(AR) crs $@ $^
@@ -52,38 +60,17 @@ win64:   ../rtmempool.win64.a
 	$(RM) $@
 	$(AR) crs $@ $^
 
-../librtmempool.dll: $(OBJS)
-	$(CC) $^ -shared $(LINK_FLAGS) -o $@
-
-../librtmempool.dylib: $(OBJS)
-	$(CC) $^ -dynamiclib $(LINK_FLAGS) -o $@
-
-../librtmempool.so: $(OBJS)
-	$(CC) $^ -shared $(LINK_FLAGS) -o $@
-
 # --------------------------------------------------------------
 
-%.c.o: %.c
-	$(CC) $< $(BUILD_C_FLAGS) -c -o $@
-
-%.c.posix32.o: %.c
-	$(CC) $< $(BUILD_C_FLAGS) $(32BIT_FLAGS) -c -o $@
+DEPS = rtmempool.c rtmempool.h rtmempool-lv2.h list.h
 
-%.c.posix64.o: %.c
-	$(CC) $< $(BUILD_C_FLAGS) $(64BIT_FLAGS) -c -o $@
+rtmempool.c.o: $(DEPS)
+	$(CC) $< $(BUILD_C_FLAGS) -c -o $@
 
-%.c.win32.o: %.c
+rtmempool.c.%32.o: $(DEPS)
 	$(CC) $< $(BUILD_C_FLAGS) $(32BIT_FLAGS) -c -o $@
 
-%.c.win64.o: %.c
+rtmempool.c.%64.o: $(DEPS)
 	$(CC) $< $(BUILD_C_FLAGS) $(64BIT_FLAGS) -c -o $@
 
 # --------------------------------------------------------------
-
-clean:
-	$(RM) *.o ../rtmempool*.a ../librtmempool.*
-
-debug:
-	$(MAKE) DEBUG=true
-
-# --------------------------------------------------------------

source/modules/rtmidi/Makefile

@@ -9,40 +9,37 @@ include ../../Makefile.mk
 # --------------------------------------------------------------
 
 BUILD_CXX_FLAGS += $(RTMIDI_FLAGS) -I. -Iinclude -I.. -I../../includes
-LINK_FLAGS      += $(RTMIDI_LIBS)
-
-OBJS = RtMidi.cpp.o
 
 # --------------------------------------------------------------
 
-all: ../rtmidi.a
+OBJS = \
+	RtMidi.cpp.o
+
+TARGETS = \
+	../rtmidi.a
 
 # --------------------------------------------------------------
 
-../rtmidi.a: $(OBJS)
-	$(RM) $@
-	$(AR) crs $@ $^
+all: $(TARGETS)
 
-../librtmidi.dll: $(OBJS)
-	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
+# --------------------------------------------------------------
 
-../librtmidi.dylib: $(OBJS)
-	$(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@
+clean:
+	$(RM) $(OBJS)
+	$(RM) $(TARGETS)
 
-../librtmidi.so: $(OBJS)
-	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
+debug:
+	$(MAKE) DEBUG=true
 
 # --------------------------------------------------------------
 
-%.cpp.o: %.cpp
-	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
+../rtmidi.a: $(OBJS)
+	$(RM) $@
+	$(AR) crs $@ $^
 
 # --------------------------------------------------------------
 
-clean:
-	$(RM) *.o ../rtmidi*.a ../librtmidi.*
-
-debug:
-	$(MAKE) DEBUG=true
+RtMidi.cpp.o: RtMidi.cpp RtMidi.h RtError.h
+	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
 # --------------------------------------------------------------