More of the same

Makefile

@@ -40,8 +40,8 @@ all: BIN RES UI WIDGETS
 # ----------------------------------------------------------------------------------------------------------------------------
 # Binaries (native)
 
-BIN: libs
-# backend bridges-plugin bridges-ui discovery interposer plugin theme
+BIN: backend theme
+# backend bridges-plugin bridges-ui discovery interposer plugin
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
@@ -53,7 +53,7 @@ ALL_LIBS += $(MODULEDIR)/juce_audio_basics.a
 ALL_LIBS += $(MODULEDIR)/juce_audio_formats.a
 ALL_LIBS += $(MODULEDIR)/juce_core.a
 ALL_LIBS += $(MODULEDIR)/lilv.a
-# ALL_LIBS += $(MODULEDIR)/native-plugins.a
+ALL_LIBS += $(MODULEDIR)/native-plugins.a
 ALL_LIBS += $(MODULEDIR)/rtmempool.a
 
 ifeq ($(MACOS_OR_WIN32),true)
@@ -125,62 +125,35 @@ $(MODULEDIR)/%.a: .FORCE
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
-backend: $(BINDIR)/libcarla_standalone2$(LIB_EXT) $(BINDIR)/libcarla_utils$(LIB_EXT)
+backend: libs
+	@$(MAKE) -C source/backend
 
-$(BINDIR)/libcarla_standalone2$(LIB_EXT): libs .FORCE
-	$(MAKE) -C source/backend
+bridges-plugin: libs
+	@$(MAKE) -C source/bridges-plugin
 
-bin/libcarla_utils$(LIB_EXT): $(BINDIR)/libcarla_standalone2$(LIB_EXT)
-	$(MAKE) -C source/backend
+bridges-ui: libs
+	@$(MAKE) -C source/bridges-ui
 
-# ----------------------------------------------------------------------------------------------------------------------------
-
-bridges-plugin: $(BINDIR)/carla-bridge-native$(APP_EXT)
-
-$(BINDIR)/carla-bridge-native$(APP_EXT): libs .FORCE
-	$(MAKE) -C source/bridges-plugin
-
-# ----------------------------------------------------------------------------------------------------------------------------
-
-bridges-ui: libs .FORCE
-	$(MAKE) -C source/bridges-ui
-
-# ----------------------------------------------------------------------------------------------------------------------------
-
-discovery: $(BINDIR)/carla-discovery-native$(APP_EXT)
-
-$(BINDIR)/carla-discovery-native$(APP_EXT): libs .FORCE
-	$(MAKE) -C source/discovery
-
-# ----------------------------------------------------------------------------------------------------------------------------
-
-interposer: $(BINDIR)/libcarla_interposer.so
-
-$(BINDIR)/libcarla_interposer.so: .FORCE
-	$(MAKE) -C source/interposer
-
-# ----------------------------------------------------------------------------------------------------------------------------
-
-plugin: plugin_build $(BINDIR)/carla.lv2/manifest.ttl
+discovery: libs
+	@$(MAKE) -C source/discovery
 
-plugin_build: libs .FORCE
-	$(MAKE) -C source/plugin
+interposer: libs
+	@$(MAKE) -C source/interposer
 
-$(BINDIR)/carla.lv2/manifest.ttl: plugin_build bridges-plugin bridges-ui discovery
-	cd bin && ./carla-lv2-export$(APP_EXT); cd ..
-	cd $(BINDIR)/carla.lv2 && $(LINK) ../*bridge-* ../carla-discovery-* .; cd ..
-
-# ----------------------------------------------------------------------------------------------------------------------------
+plugin: libs
+	@$(MAKE) -C source/plugin
 
 ifeq ($(HAVE_QT),true)
-theme: $(BINDIR)/styles/carlastyle$(LIB_EXT)
-
-$(BINDIR)/styles/carlastyle$(LIB_EXT): .FORCE
-	$(MAKE) -C source/modules/theme
+theme:
+	@$(MAKE) -C source/modules/theme
 else
 theme:
 endif
 
+# $(BINDIR)/carla.lv2/manifest.ttl: plugin_build bridges-plugin bridges-ui discovery
+# 	cd bin && ./carla-lv2-export$(APP_EXT); cd ..
+# 	cd $(BINDIR)/carla.lv2 && $(LINK) ../*bridge-* ../carla-discovery-* .; cd ..
+
 # ----------------------------------------------------------------------------------------------------------------------------
 # Binaries (posix32)
 

source/backend/Makefile

@@ -130,6 +130,6 @@ $(OBJDIR)/%.cpp.o: %.cpp
 	@echo "Compiling $<"
 	@$(CXX) $< $(BUILD_CXX_FLAGS) -MMD -c -o $@
 
--include $(OBJS:%.cpp.o=%.cpp.d)
+-include $(OBJS:%.o=%.d)
 
 # ----------------------------------------------------------------------------------------------------------------------------

source/backend/engine/Makefile

@@ -82,7 +82,6 @@ $(OBJDIR)/%.cpp.o: %.cpp
 	@echo "Compiling $<"
 	@$(CXX) $< $(BUILD_CXX_FLAGS) -MMD -c -o $@
 
--include $(OBJSa:%.cpp.o=%.cpp.d)
--include $(OBJDIR)/CarlaEngineNative.cpp.exp.d
+-include $(OBJS:%.o=%.d)
 
 # ----------------------------------------------------------------------------------------------------------------------------

source/backend/plugin/Makefile

@@ -65,6 +65,6 @@ $(OBJDIR)/%.cpp.o: %.cpp
 	@echo "Compiling $<"
 	@$(CXX) $< $(BUILD_CXX_FLAGS) -MMD -c -o $@
 
--include $(OBJS:%.cpp.o=%.cpp.d)
+-include $(OBJS:%.o=%.d)
 
 # ----------------------------------------------------------------------------------------------------------------------------

source/modules/jackbridge/Makefile

@@ -144,8 +144,6 @@ $(OBJDIR)/JackBridge2.cpp.o: JackBridge2.cpp
 	@echo "Compiling JackBridge2.cpp"
 	@$(CXX) $< $(BUILD_CXX_FLAGS) -MMD -c -o $@
 
--include $(OBJS:%.cpp.o=%.cpp.d)
-
 # ----------------------------------------------------------------------------------------------------------------------------
 
 $(OBJDIR)/JackBridgeExport.cpp.%32e.o: JackBridgeExport.cpp
@@ -158,11 +156,6 @@ $(OBJDIR)/JackBridgeExport.cpp.%64e.o: JackBridgeExport.cpp
 	@echo "Compiling $<"
 	@$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -MMD -fpermissive -c -o $@
 
--include $(OBJDIR)/JackBridgeExport.cpp.posix32e.d
--include $(OBJDIR)/JackBridgeExport.cpp.posix64e.d
--include $(OBJDIR)/JackBridgeExport.cpp.win32e.d
--include $(OBJDIR)/JackBridgeExport.cpp.win64e.d
-
 # ----------------------------------------------------------------------------------------------------------------------------
 
 $(OBJDIR)/%.cpp.posix32.o: %.cpp
@@ -195,11 +188,18 @@ $(OBJDIR)/%.cpp.wine64.o: %.cpp
 	@echo "Compiling $< (wine64)"
 	@$(WINECXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -MMD -c -o $@
 
--include $(OBJS_posix32:%.cpp.posix32.o=%.cpp.posix32.d)
--include $(OBJS_posix64:%.cpp.posix64.o=%.cpp.posix64.d)
--include $(OBJS_win32:%.cpp.win32.o=%.cpp.win32.d)
--include $(OBJS_win64:%.cpp.win64.o=%.cpp.win64.d)
--include $(OBJS_wine32:%.cpp.wine32.o=%.cpp.wine32.d)
--include $(OBJS_wine64:%.cpp.wine64.o=%.cpp.wine64.d)
+# ----------------------------------------------------------------------------------------------------------------------------
+
+-include $(OBJS:%.o=%.d)
+-include $(OBJS_posix32:%.o=%.d)
+-include $(OBJS_posix32e:%.o=%.d)
+-include $(OBJS_posix64:%.o=%.d)
+-include $(OBJS_posix64e:%.o=%.d)
+-include $(OBJS_win32:%.o=%.d)
+-include $(OBJS_win32e:%.o=%.d)
+-include $(OBJS_win64:%.o=%.d)
+-include $(OBJS_win64e:%.o=%.d)
+-include $(OBJS_wine32:%.o=%.d)
+-include $(OBJS_wine64:%.o=%.d)
 
 # ----------------------------------------------------------------------------------------------------------------------------

source/modules/juce_audio_basics/Makefile

@@ -110,16 +110,10 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
-ifeq ($(MACOS),true)
--include $(OBJDIR)/$(MODULENAME).mm.d
--include $(OBJDIR)/$(MODULENAME).mm.posix32.d
--include $(OBJDIR)/$(MODULENAME).mm.posix64.d
-else
--include $(OBJDIR)/$(MODULENAME).cpp.d
--include $(OBJDIR)/$(MODULENAME).cpp.posix32.d
--include $(OBJDIR)/$(MODULENAME).cpp.posix64.d
-endif
--include $(OBJDIR)/$(MODULENAME).cpp.win32.d
--include $(OBJDIR)/$(MODULENAME).cpp.win64.d
+-include $(OBJS:%.o=%.d)
+-include $(OBJS_posix32:%.o=%.d)
+-include $(OBJS_posix64:%.o=%.d)
+-include $(OBJS_win32:%.o=%.d)
+-include $(OBJS_win64:%.o=%.d)
 
 # ----------------------------------------------------------------------------------------------------------------------------

source/modules/juce_audio_devices/Makefile

@@ -114,16 +114,10 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
-ifeq ($(MACOS),true)
--include $(OBJDIR)/$(MODULENAME).mm.d
--include $(OBJDIR)/$(MODULENAME).mm.posix32.d
--include $(OBJDIR)/$(MODULENAME).mm.posix64.d
-else
--include $(OBJDIR)/$(MODULENAME).cpp.d
--include $(OBJDIR)/$(MODULENAME).cpp.posix32.d
--include $(OBJDIR)/$(MODULENAME).cpp.posix64.d
-endif
--include $(OBJDIR)/$(MODULENAME).cpp.win32.d
--include $(OBJDIR)/$(MODULENAME).cpp.win64.d
+-include $(OBJS:%.o=%.d)
+-include $(OBJS_posix32:%.o=%.d)
+-include $(OBJS_posix64:%.o=%.d)
+-include $(OBJS_win32:%.o=%.d)
+-include $(OBJS_win64:%.o=%.d)
 
 # ----------------------------------------------------------------------------------------------------------------------------

source/modules/juce_audio_formats/Makefile

@@ -110,16 +110,10 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
-ifeq ($(MACOS),true)
--include $(OBJDIR)/$(MODULENAME).mm.d
--include $(OBJDIR)/$(MODULENAME).mm.posix32.d
--include $(OBJDIR)/$(MODULENAME).mm.posix64.d
-else
--include $(OBJDIR)/$(MODULENAME).cpp.d
--include $(OBJDIR)/$(MODULENAME).cpp.posix32.d
--include $(OBJDIR)/$(MODULENAME).cpp.posix64.d
-endif
--include $(OBJDIR)/$(MODULENAME).cpp.win32.d
--include $(OBJDIR)/$(MODULENAME).cpp.win64.d
+-include $(OBJS:%.o=%.d)
+-include $(OBJS_posix32:%.o=%.d)
+-include $(OBJS_posix64:%.o=%.d)
+-include $(OBJS_win32:%.o=%.d)
+-include $(OBJS_win64:%.o=%.d)
 
 # ----------------------------------------------------------------------------------------------------------------------------

source/modules/juce_audio_processors/Makefile

@@ -125,16 +125,10 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
-ifeq ($(MACOS),true)
--include $(OBJDIR)/$(MODULENAME).mm.d
--include $(OBJDIR)/$(MODULENAME).mm.posix32.d
--include $(OBJDIR)/$(MODULENAME).mm.posix64.d
-else
--include $(OBJDIR)/$(MODULENAME).cpp.d
--include $(OBJDIR)/$(MODULENAME).cpp.posix32.d
--include $(OBJDIR)/$(MODULENAME).cpp.posix64.d
-endif
--include $(OBJDIR)/$(MODULENAME).cpp.win32.d
--include $(OBJDIR)/$(MODULENAME).cpp.win64.d
+-include $(OBJS:%.o=%.d)
+-include $(OBJS_posix32:%.o=%.d)
+-include $(OBJS_posix64:%.o=%.d)
+-include $(OBJS_win32:%.o=%.d)
+-include $(OBJS_win64:%.o=%.d)
 
 # ----------------------------------------------------------------------------------------------------------------------------

source/modules/juce_core/Makefile

@@ -110,16 +110,10 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
-ifeq ($(MACOS),true)
--include $(OBJDIR)/$(MODULENAME).mm.d
--include $(OBJDIR)/$(MODULENAME).mm.posix32.d
--include $(OBJDIR)/$(MODULENAME).mm.posix64.d
-else
--include $(OBJDIR)/$(MODULENAME).cpp.d
--include $(OBJDIR)/$(MODULENAME).cpp.posix32.d
--include $(OBJDIR)/$(MODULENAME).cpp.posix64.d
-endif
--include $(OBJDIR)/$(MODULENAME).cpp.win32.d
--include $(OBJDIR)/$(MODULENAME).cpp.win64.d
+-include $(OBJS:%.o=%.d)
+-include $(OBJS_posix32:%.o=%.d)
+-include $(OBJS_posix64:%.o=%.d)
+-include $(OBJS_win32:%.o=%.d)
+-include $(OBJS_win64:%.o=%.d)
 
 # ----------------------------------------------------------------------------------------------------------------------------

source/modules/juce_data_structures/Makefile

@@ -110,16 +110,10 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
-ifeq ($(MACOS),true)
--include $(OBJDIR)/$(MODULENAME).mm.d
--include $(OBJDIR)/$(MODULENAME).mm.posix32.d
--include $(OBJDIR)/$(MODULENAME).mm.posix64.d
-else
--include $(OBJDIR)/$(MODULENAME).cpp.d
--include $(OBJDIR)/$(MODULENAME).cpp.posix32.d
--include $(OBJDIR)/$(MODULENAME).cpp.posix64.d
-endif
--include $(OBJDIR)/$(MODULENAME).cpp.win32.d
--include $(OBJDIR)/$(MODULENAME).cpp.win64.d
+-include $(OBJS:%.o=%.d)
+-include $(OBJS_posix32:%.o=%.d)
+-include $(OBJS_posix64:%.o=%.d)
+-include $(OBJS_win32:%.o=%.d)
+-include $(OBJS_win64:%.o=%.d)
 
 # ----------------------------------------------------------------------------------------------------------------------------

source/modules/juce_events/Makefile

@@ -110,16 +110,10 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
-ifeq ($(MACOS),true)
--include $(OBJDIR)/$(MODULENAME).mm.d
--include $(OBJDIR)/$(MODULENAME).mm.posix32.d
--include $(OBJDIR)/$(MODULENAME).mm.posix64.d
-else
--include $(OBJDIR)/$(MODULENAME).cpp.d
--include $(OBJDIR)/$(MODULENAME).cpp.posix32.d
--include $(OBJDIR)/$(MODULENAME).cpp.posix64.d
-endif
--include $(OBJDIR)/$(MODULENAME).cpp.win32.d
--include $(OBJDIR)/$(MODULENAME).cpp.win64.d
+-include $(OBJS:%.o=%.d)
+-include $(OBJS_posix32:%.o=%.d)
+-include $(OBJS_posix64:%.o=%.d)
+-include $(OBJS_win32:%.o=%.d)
+-include $(OBJS_win64:%.o=%.d)
 
 # ----------------------------------------------------------------------------------------------------------------------------

source/modules/juce_graphics/Makefile

@@ -110,16 +110,10 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
-ifeq ($(MACOS),true)
--include $(OBJDIR)/$(MODULENAME).mm.d
--include $(OBJDIR)/$(MODULENAME).mm.posix32.d
--include $(OBJDIR)/$(MODULENAME).mm.posix64.d
-else
--include $(OBJDIR)/$(MODULENAME).cpp.d
--include $(OBJDIR)/$(MODULENAME).cpp.posix32.d
--include $(OBJDIR)/$(MODULENAME).cpp.posix64.d
-endif
--include $(OBJDIR)/$(MODULENAME).cpp.win32.d
--include $(OBJDIR)/$(MODULENAME).cpp.win64.d
+-include $(OBJS:%.o=%.d)
+-include $(OBJS_posix32:%.o=%.d)
+-include $(OBJS_posix64:%.o=%.d)
+-include $(OBJS_win32:%.o=%.d)
+-include $(OBJS_win64:%.o=%.d)
 
 # ----------------------------------------------------------------------------------------------------------------------------

source/modules/juce_gui_basics/Makefile

@@ -110,16 +110,10 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
-ifeq ($(MACOS),true)
--include $(OBJDIR)/$(MODULENAME).mm.d
--include $(OBJDIR)/$(MODULENAME).mm.posix32.d
--include $(OBJDIR)/$(MODULENAME).mm.posix64.d
-else
--include $(OBJDIR)/$(MODULENAME).cpp.d
--include $(OBJDIR)/$(MODULENAME).cpp.posix32.d
--include $(OBJDIR)/$(MODULENAME).cpp.posix64.d
-endif
--include $(OBJDIR)/$(MODULENAME).cpp.win32.d
--include $(OBJDIR)/$(MODULENAME).cpp.win64.d
+-include $(OBJS:%.o=%.d)
+-include $(OBJS_posix32:%.o=%.d)
+-include $(OBJS_posix64:%.o=%.d)
+-include $(OBJS_win32:%.o=%.d)
+-include $(OBJS_win64:%.o=%.d)
 
 # ----------------------------------------------------------------------------------------------------------------------------

source/modules/juce_gui_extra/Makefile

@@ -110,16 +110,10 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
-ifeq ($(MACOS),true)
--include $(OBJDIR)/$(MODULENAME).mm.d
--include $(OBJDIR)/$(MODULENAME).mm.posix32.d
--include $(OBJDIR)/$(MODULENAME).mm.posix64.d
-else
--include $(OBJDIR)/$(MODULENAME).cpp.d
--include $(OBJDIR)/$(MODULENAME).cpp.posix32.d
--include $(OBJDIR)/$(MODULENAME).cpp.posix64.d
-endif
--include $(OBJDIR)/$(MODULENAME).cpp.win32.d
--include $(OBJDIR)/$(MODULENAME).cpp.win64.d
+-include $(OBJS:%.o=%.d)
+-include $(OBJS_posix32:%.o=%.d)
+-include $(OBJS_posix64:%.o=%.d)
+-include $(OBJS_win32:%.o=%.d)
+-include $(OBJS_win64:%.o=%.d)
 
 # ----------------------------------------------------------------------------------------------------------------------------

source/modules/lilv/Makefile

@@ -145,10 +145,10 @@ $(OBJDIR)/lilv.c.%64.o: lilv.c
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
--include $(OBJS:%.c.o=%.c.d)
--include $(OBJS_posix32:%.c.posix32.o=%.c.posix32.d)
--include $(OBJS_posix64:%.c.posix64.o=%.c.posix64.d)
--include $(OBJS_win32:%.c.win32.o=%.c.win32.d)
--include $(OBJS_win64:%.c.win64.o=%.c.win64.d)
+-include $(OBJS:%.o=%.d)
+-include $(OBJS_posix32:%.o=%.d)
+-include $(OBJS_posix64:%.o=%.d)
+-include $(OBJS_win32:%.o=%.d)
+-include $(OBJS_win64:%.o=%.d)
 
 # ----------------------------------------------------------------------------------------------------------------------------

source/modules/native-plugins/Makefile

@@ -4,14 +4,16 @@
 # Created by falkTX
 #
 
-include ../../Makefile.mk
+CWD=../..
+MODULENAME=native-plugins
+include ../Makefile.mk
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
-BUILD_C_FLAGS   += -I. -I../../includes -isystem ..
-BUILD_CXX_FLAGS += -I. -I../../includes -I../../utils -I../distrho -isystem ..
+BUILD_C_FLAGS   += -isystem ..
+BUILD_CXX_FLAGS += -I../distrho -isystem ..
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 # Flags for _all.c
 
 ALL_C_FLAGS  = $(BUILD_C_FLAGS)
@@ -21,7 +23,7 @@ ifeq ($(HAVE_ZYN_DEPS),true)
 ALL_C_FLAGS += -DWANT_ZYNADDSUBFX
 endif
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 # Flags for ZynAddSubFX
 
 ifeq ($(HAVE_ZYN_DEPS),true)
@@ -36,45 +38,42 @@ ZYN_CXX_FLAGS += $(shell pkg-config --cflags ntk_images ntk)
 endif
 endif
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 # Set objects
 
-OBJS = _all.c.o
+OBJS = \
+	$(OBJDIR)/_all.c.o
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 # Simple plugins
 
 OBJS += \
-	bypass.c.o \
-	lfo.c.o \
-	midi-gain.c.o \
-	midi-split.c.o \
-	midi-through.c.o \
-	midi-transpose.c.o \
-	nekofilter.c.o
+	$(OBJDIR)/bypass.c.o \
+	$(OBJDIR)/lfo.c.o \
+	$(OBJDIR)/midi-gain.c.o \
+	$(OBJDIR)/midi-split.c.o \
+	$(OBJDIR)/midi-through.c.o \
+	$(OBJDIR)/midi-transpose.c.o \
+	$(OBJDIR)/nekofilter.c.o
 
 OBJS += \
-	audio-file.cpp.o \
-	midi-file.cpp.o
+	$(OBJDIR)/audio-file.cpp.o \
+	$(OBJDIR)/bigmeter.cpp.o \
+	$(OBJDIR)/midi-file.cpp.o \
+	$(OBJDIR)/notes.cpp.o
 
-# --------------------------------------------------------------
-# External-UI plugins
-
-OBJS += \
-	bigmeter.cpp.o \
-	notes.cpp.o
-
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 # ZynAddSubFX
 
 ifeq ($(HAVE_ZYN_DEPS),true)
 OBJS += \
-	zynaddsubfx-fx.cpp.o \
-	zynaddsubfx-synth.cpp.o \
-	zynaddsubfx-src.cpp.o
+	$(OBJDIR)/zynaddsubfx-fx.cpp.o \
+	$(OBJDIR)/zynaddsubfx-synth.cpp.o \
+	$(OBJDIR)/zynaddsubfx-src.cpp.o
 
 ifeq ($(HAVE_ZYN_UI_DEPS),true)
-OBJS += zynaddsubfx-ui.cpp.o
+OBJS += \
+	$(OBJDIR)/zynaddsubfx-ui.cpp.o
 
 ZYN_UI_FILES_CPP = \
 	zynaddsubfx/UI/ADnoteUI.cpp \
@@ -114,78 +113,72 @@ ZYN_UI_FILES_H = \
 endif
 endif
 
-# --------------------------------------------------------------
-
-all: ../native-plugins.a
-
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
-../native-plugins.a: $(OBJS)
-	$(RM) $@
-	$(AR) crs $@ $^
+all: $(MODULEDIR)/$(MODULENAME).a
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
-CDEPS   = ../CarlaNative.h
-
-_all.c.o: _all.c $(CDEPS)
-	$(CC) $< $(ALL_C_FLAGS) -c -o $@
-
-bypass.c.o: bypass.c $(CDEPS)
-	$(CC) $< $(BUILD_C_FLAGS) -c -o $@
-
-lfo.c.o: lfo.c $(CDEPS)
-	$(CC) $< $(BUILD_C_FLAGS) -c -o $@
-
-midi-%.c.o: midi-%.c $(CDEPS)
-	$(CC) $< $(BUILD_C_FLAGS) -c -o $@
+clean:
+	rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a $(ZYN_UI_FILES_H) $(ZYN_UI_FILES_CPP)
 
-nekofilter.c.o: nekofilter.c nekofilter/*.c nekofilter/*.h $(CDEPS)
-	$(CC) $< $(BUILD_C_FLAGS) -c -o $@
+debug:
+	$(MAKE) DEBUG=true
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
-CXXDEPS = ../CarlaNative.h ../CarlaNative.hpp
+$(MODULEDIR)/$(MODULENAME).a: $(OBJS)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).a"
+	@rm -f $@
+	@$(AR) crs $@ $^
 
-audio-file.cpp.o: audio-file.cpp $(CXXDEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
+# ----------------------------------------------------------------------------------------------------------------------------
 
-bigmeter.cpp.o: bigmeter.cpp $(CXXDEPS) ../CarlaNativeExtUI.hpp
-	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
+zynaddsubfx/UI/%.cpp: zynaddsubfx/UI/%.fl
+	@echo "Generating $@/h"
+	@ntk-fluid -c -o zynaddsubfx/UI/$*.cpp -h zynaddsubfx/UI/$*.h $<
 
-midi-file.cpp.o: midi-file.cpp midi-base.hpp $(CXXDEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
+zynaddsubfx/UI/%.h: zynaddsubfx/UI/%.fl
+	@echo "Generating $@/cpp"
+	@ntk-fluid -c -o zynaddsubfx/UI/$*.cpp -h zynaddsubfx/UI/$*.h $<
 
-midi-sequencer.cpp.o: midi-sequencer.cpp midi-base.hpp $(CXXDEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
+# ----------------------------------------------------------------------------------------------------------------------------
 
-notes.cpp.o: notes.cpp $(CXXDEPS) ../CarlaNativeExtUI.hpp
-	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
+$(OBJDIR)/_all.c.o: _all.c
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $<"
+	@$(CC) $< $(ALL_C_FLAGS) -MMD -c -o $@
 
-zynaddsubfx-%.cpp.o: zynaddsubfx-%.cpp $(CXXDEPS) $(ZYN_UI_FILES_H)
-	$(CXX) $< $(ZYN_CXX_FLAGS) -c -o $@
+$(OBJDIR)/%.c.o: %.c
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $<"
+	@$(CC) $< $(BUILD_C_FLAGS) -MMD -c -o $@
 
-zynaddsubfx-src.cpp.o: zynaddsubfx-src.cpp $(ZYN_UI_FILES_H)
-	$(CXX) $< $(ZYN_CXX_FLAGS) -w -c -o $@
+# ----------------------------------------------------------------------------------------------------------------------------
 
-zynaddsubfx-ui.cpp.o: zynaddsubfx-ui.cpp $(ZYN_UI_FILES_H) $(ZYN_UI_FILES_CPP)
-	$(CXX) $< $(ZYN_CXX_FLAGS) -w -c -o $@
+$(OBJDIR)/zynaddsubfx-src.cpp.o: zynaddsubfx-src.cpp $(ZYN_UI_FILES_H)
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $<"
+	@$(CXX) $< $(ZYN_CXX_FLAGS) -MMD -w -c -o $@
 
-zynaddsubfx/UI/%.cpp: zynaddsubfx/UI/%.fl
-	ntk-fluid -c -o zynaddsubfx/UI/$*.cpp -h zynaddsubfx/UI/$*.h $<
+$(OBJDIR)/zynaddsubfx-ui.cpp.o: zynaddsubfx-ui.cpp $(ZYN_UI_FILES_H) $(ZYN_UI_FILES_CPP)
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $<"
+	@$(CXX) $< $(ZYN_CXX_FLAGS) -MMD -w -c -o $@
 
-zynaddsubfx/UI/%.h: zynaddsubfx/UI/%.fl
-	ntk-fluid -c -o zynaddsubfx/UI/$*.cpp -h zynaddsubfx/UI/$*.h $<
+$(OBJDIR)/zynaddsubfx-%.cpp.o: zynaddsubfx-%.cpp $(ZYN_UI_FILES_H)
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $<"
+	@$(CXX) $< $(ZYN_CXX_FLAGS) -MMD -c -o $@
 
-# --------------------------------------------------------------
+$(OBJDIR)/%.cpp.o: %.cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $<"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) -MMD -c -o $@
 
-clean:
-	$(RM) *.o ../native-plugins*.a ../libnative-plugins.*
-ifeq ($(HAVE_ZYN_UI_DEPS),true)
-	$(RM) $(ZYN_UI_FILES_H) $(ZYN_UI_FILES_CPP)
-endif
+# ----------------------------------------------------------------------------------------------------------------------------
 
-debug:
-	$(MAKE) DEBUG=true
+-include $(OBJS:%.o=%.d)
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------

source/modules/rtaudio/Makefile

@@ -43,6 +43,6 @@ $(OBJDIR)/%.cpp.o: %.cpp
 	@echo "Compiling $<"
 	@$(CXX) $< $(BUILD_CXX_FLAGS) -MMD -c -o $@
 
--include $(OBJS:%.cpp.o=%.cpp.d)
+-include $(OBJS:%.o=%.d)
 
 # ----------------------------------------------------------------------------------------------------------------------------

source/modules/rtmempool/Makefile

@@ -87,10 +87,10 @@ $(OBJDIR)/$(MODULENAME).c.%64.o: $(MODULENAME).c
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
--include $(OBJS:%.c.o=%.c.d)
--include $(OBJS_posix32:%.c.posix32.o=%.c.posix32.d)
--include $(OBJS_posix64:%.c.posix64.o=%.c.posix64.d)
--include $(OBJS_win32:%.c.win32.o=%.c.win32.d)
--include $(OBJS_win64:%.c.win64.o=%.c.win64.d)
+-include $(OBJS:%.o=%.d)
+-include $(OBJS_posix32:%.o=%.d)
+-include $(OBJS_posix64:%.o=%.d)
+-include $(OBJS_win32:%.o=%.d)
+-include $(OBJS_win64:%.o=%.d)
 
 # ----------------------------------------------------------------------------------------------------------------------------

source/modules/rtmidi/Makefile

@@ -43,6 +43,6 @@ $(OBJDIR)/%.cpp.o: %.cpp
 	@echo "Compiling $<"
 	@$(CXX) $< $(BUILD_CXX_FLAGS) -MMD -c -o $@
 
--include $(OBJS:%.cpp.o=%.cpp.d)
+-include $(OBJS:%.o=%.d)
 
 # ----------------------------------------------------------------------------------------------------------------------------

source/modules/theme/Makefile

@@ -202,9 +202,8 @@ $(OBJDIR)/%.cpp.qt5.o: %.cpp $(OBJDIR)/moc_CarlaStyle.qt5.cpp
 	@echo "Compiling $< (Qt5)"
 	@$(CXX) $< $(QT5_CXX_FLAGS) -MMD -c -o $@
 
--include $(OBJSDIR)/CarlaStyle.cpp.qt4.d
--include $(OBJSDIR)/CarlaStyle.cpp.qt5.d
--include $(OBJSDIR)/CarlaStylePlugin.cpp.qt4.d
--include $(OBJSDIR)/CarlaStylePlugin.cpp.qt5.d
+# ----------------------------------------------------------------------------------------------------------------------------
+
+-include $(OBJS:%.o=%.d)
 
 # ----------------------------------------------------------------------------------------------------------------------------