Rework some makefiles

source/Makefile.mk

@@ -23,6 +23,7 @@ CARLA_SAMPLERS_SUPPORT = true
 # DO NOT MODIFY PAST THIS POINT!
 
 AR  ?= ar
+RM  ?= rm -f
 CC  ?= gcc
 CXX ?= g++
 MOC ?= moc
@@ -141,8 +142,7 @@ RTAUDIO_FLAGS += -D__RTAUDIO_DEBUG__
 RTMIDI_FLAGS  += -D__RTMIDI_DEBUG__
 endif
 
-ifeq ($(HAIKU),true)
-endif
+RTMEMPOOL_LIBS = -lpthread
 
 ifeq ($(LINUX),true)
 ifeq ($(HAVE_OPENGL),true)
@@ -157,7 +157,7 @@ JUCE_GRAPHICS_FLAGS      = $(shell pkg-config --cflags x11 xinerama xext freetyp
 JUCE_GRAPHICS_LIBS       = $(shell pkg-config --libs x11 xinerama xext freetype2)
 JUCE_GUI_BASICS_FLAGS    = $(shell pkg-config --cflags x11 xinerama xext xcursor)
 JUCE_GUI_BASICS_LIBS     = $(shell pkg-config --libs x11 xinerama xext xcursor) -ldl
-LILV_LIBS                = -ldl -lrt
+LILV_LIBS                = -ldl -lm -lrt
 ifeq ($(HAVE_ALSA),true)
 RTAUDIO_FLAGS           += $(shell pkg-config --cflags alsa) -D__LINUX_ALSA__
 RTAUDIO_LIBS            += $(shell pkg-config --libs alsa) -lpthread
@@ -165,8 +165,8 @@ RTMIDI_FLAGS            += $(shell pkg-config --cflags alsa) -D__LINUX_ALSASEQ__
 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
 
@@ -179,7 +179,7 @@ JUCE_AUDIO_FORMATS_LIBS = -framework CoreAudio -framework CoreMIDI -framework Qu
 JUCE_CORE_LIBS          = -framework Cocoa -framework IOKit
 JUCE_GRAPHICS_LIBS      = -framework Cocoa -framework QuartzCore
 JUCE_GUI_BASICS_LIBS    = -framework Cocoa -framework Carbon -framework QuartzCore
-LILV_LIBS               = -ldl
+LILV_LIBS               = -ldl -lm
 RTAUDIO_FLAGS          += -D__MACOSX_CORE__
 RTAUDIO_LIBS           += -lpthread
 RTMIDI_FLAGS           += -D__MACOSX_CORE__
@@ -193,6 +193,7 @@ JUCE_CORE_LIBS          = -luuid -lwsock32 -lwininet -lversion -lole32 -lws2_32
 JUCE_EVENTS_LIBS        = -lole32
 JUCE_GRAPHICS_LIBS      = -lgdi32
 JUCE_GUI_BASICS_LIBS    = -lgdi32 -limm32 -lcomdlg32 -lole32
+LILV_LIBS               = -lm
 RTAUDIO_FLAGS          += -D__WINDOWS_ASIO__ -D__WINDOWS_DS__
 RTAUDIO_LIBS           += -lpthread
 RTMIDI_FLAGS           += -D__WINDOWS_MM__

source/modules/Makefile

@@ -104,6 +104,9 @@ lilv_%:
 rtaudio:
 	$(MAKE) -C rtaudio
 
+rtmidi:
+	$(MAKE) -C rtmidi
+
 # --------------------------------------------------------------
 
 rtmempool:
@@ -114,6 +117,14 @@ rtmempool_%:
 
 # --------------------------------------------------------------
 
+stk:
+	$(MAKE) -C stk
+
+stk_%:
+	$(MAKE) -C stk $*
+
+# --------------------------------------------------------------
+
 theme:
 	$(MAKE) -C theme
 
@@ -166,14 +177,15 @@ clean:
 	$(MAKE) clean -C juce_gui_basics
 	$(MAKE) clean -C lilv
 	$(MAKE) clean -C rtaudio
+	$(MAKE) clean -C rtmidi
 	$(MAKE) clean -C rtmempool
+	$(MAKE) clean -C stk
 	$(MAKE) clean -C theme
-	$(MAKE) clean -C widgets
 
 # --------------------------------------------------------------
 
 .PHONY: \
-	carla_native lilv rtaudio rtmidi rtmempool theme \
+	carla_native jackbridge lilv rtaudio rtmidi rtmempool stk theme \
 	juce_audio_basics juce_audio_devices juce_audio_formats juce_audio_processors juce_core juce_data_structures juce_events juce_graphics juce_gui_basics
 
 # --------------------------------------------------------------

source/modules/carla_native/Makefile

@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# Makefile for carla-native #
+# Makefile for carla_native #
 # ------------------------- #
 # Created by falkTX
 #
@@ -11,20 +11,18 @@ include ../../Makefile.mk
 BUILD_C_FLAGS   += -I. -I.. -I../../includes
 BUILD_CXX_FLAGS += -I. -I.. -I../../includes -I../../utils -I../distrho
 
-LINK_FLAGS      += ../juce_audio_basics.a $(JUCE_AUDIO_BASICS_LIBS)
-LINK_FLAGS      += ../juce_core.a $(JUCE_CORE_LIBS)
-LINK_FLAGS      += ../juce_data_structures.a $(JUCE_DATA_STRUCTURES_LIBS)
-LINK_FLAGS      += ../juce_events.a $(JUCE_EVENTS_LIBS)
-LINK_FLAGS      += ../juce_graphics.a $(JUCE_GRAPHICS_LIBS)
-LINK_FLAGS      += ../juce_gui_basics.a $(JUCE_GUI_BASICS_LIBS)
-
-# --------------------------------------------------------------
-
+LINK_FLAGS      += -L..
 ifeq ($(HAVE_OPENGL),true)
-GL_CXX_FLAGS   = $(BUILD_CXX_FLAGS)
-GL_CXX_FLAGS  += $(shell pkg-config --cflags gl)
-LINK_FLAGS    += ../dgl.a $(shell pkg-config --libs gl)
+LINK_FLAGS      += -ldgl $(DGL_LIBS)
 endif
+LINK_FLAGS      += -ljuce_audio_basics $(JUCE_AUDIO_BASICS_LIBS)
+LINK_FLAGS      += -ljuce_core $(JUCE_CORE_LIBS)
+LINK_FLAGS      += -ljuce_data_structures $(JUCE_DATA_STRUCTURES_LIBS)
+LINK_FLAGS      += -ljuce_events $(JUCE_EVENTS_LIBS)
+LINK_FLAGS      += -ljuce_graphics $(JUCE_GRAPHICS_LIBS)
+LINK_FLAGS      += -ljuce_gui_basics $(JUCE_GUI_BASICS_LIBS)
+
+# --------------------------------------------------------------
 
 ifeq ($(HAVE_AF_DEPS),true)
 AF_C_FLAGS     = $(BUILD_C_FLAGS)
@@ -161,8 +159,8 @@ all: ../carla_native.a
 # --------------------------------------------------------------
 
 ../carla_native.a: $(OBJS)
-	rm -f $@
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../libcarla_native.dll: $(OBJS)
 	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
@@ -178,6 +176,9 @@ all: ../carla_native.a
 CDEPS   = ../CarlaNative.h
 CXXDEPS = ../CarlaNative.h ../CarlaNative.hpp
 
+%.c.o: %.c
+	$(CC) $< $(BUILD_C_FLAGS) -c -o $@
+
 audio_decoder/%.c.o: audio_decoder/%.c
 	$(CC) $< $(AF_C_FLAGS) -c -o $@
 
@@ -185,19 +186,19 @@ audio-file.cpp.o: audio-file.cpp audio-base.hpp $(CXXDEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
 distrho-3bandeq.cpp.o: distrho-3bandeq.cpp 3bandeq/*.cpp 3bandeq/*.h 3bandeq/*.hpp distrho/DistrhoPluginCarla.cpp $(CXXDEPS)
-	$(CXX) $< $(GL_CXX_FLAGS) -I3bandeq -DDISTRHO_NAMESPACE=DISTRHO_3BandEQ -c -o $@
+	$(CXX) $< $(BUILD_CXX_FLAGS) -I3bandeq -DDISTRHO_NAMESPACE=DISTRHO_3BandEQ -c -o $@
 
 distrho-3bandsplitter.cpp.o: distrho-3bandsplitter.cpp 3bandsplitter/*.cpp 3bandsplitter/*.h 3bandsplitter/*.hpp distrho/DistrhoPluginCarla.cpp $(CXXDEPS)
-	$(CXX) $< $(GL_CXX_FLAGS) -I3bandsplitter -DDISTRHO_NAMESPACE=DISTRHO_3BandSplitter -c -o $@
+	$(CXX) $< $(BUILD_CXX_FLAGS) -I3bandsplitter -DDISTRHO_NAMESPACE=DISTRHO_3BandSplitter -c -o $@
 
 distrho-nekobi.cpp.o: distrho-nekobi.cpp nekobi/*.cpp nekobi/*.h nekobi/*.hpp nekobi/nekobee-src/*.c nekobi/nekobee-src/*.h distrho/DistrhoPluginCarla.cpp $(CXXDEPS)
-	$(CXX) $< $(GL_CXX_FLAGS) -Inekobi -DDISTRHO_NAMESPACE=DISTRHO_Nekobi -c -o $@
+	$(CXX) $< $(BUILD_CXX_FLAGS) -Inekobi -DDISTRHO_NAMESPACE=DISTRHO_Nekobi -c -o $@
 
 distrho-pingpongpan.cpp.o: distrho-pingpongpan.cpp pingpongpan/*.cpp pingpongpan/*.h pingpongpan/*.hpp distrho/DistrhoPluginCarla.cpp $(CXXDEPS)
-	$(CXX) $< $(GL_CXX_FLAGS) -Ipingpongpan -DDISTRHO_NAMESPACE=DISTRHO_PingPongPan -c -o $@
+	$(CXX) $< $(BUILD_CXX_FLAGS) -Ipingpongpan -DDISTRHO_NAMESPACE=DISTRHO_PingPongPan -c -o $@
 
 distrho-stereoenhancer.cpp.o: distrho-stereoenhancer.cpp stereoenhancer/*.cpp stereoenhancer/*.h stereoenhancer/*.hpp distrho/DistrhoPluginCarla.cpp $(CXXDEPS)
-	$(CXX) $< $(GL_CXX_FLAGS) -Istereoenhancer -DDISTRHO_NAMESPACE=DISTRHO_StereoEnhancer -c -o $@
+	$(CXX) $< $(BUILD_CXX_FLAGS) -Istereoenhancer -DDISTRHO_NAMESPACE=DISTRHO_StereoEnhancer -c -o $@
 
 distrho-bigmeter.cpp.o: distrho-bigmeter.cpp bigmeter/*.cpp bigmeter/*.h bigmeter/*.hpp distrho/DistrhoPluginCarla.cpp $(CXXDEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) -Ibigmeter -DDISTRHO_NAMESPACE=DISTRHO_BigMeter -c -o $@
@@ -220,10 +221,10 @@ nekofilter.c.o: nekofilter.c nekofilter/*.c nekofilter/*.h $(CDEPS)
 vex-%.cpp.o: vex-%.cpp
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-zynaddsubfx-ui.cpp.o: zynaddsubfx-ui.cpp $(ZYN_UI_FILES_H) $(ZYN_UI_FILES_CPP)
+zynaddsubfx-%.cpp.o: zynaddsubfx-%.cpp $(CXXDEPS) $(ZYN_UI_FILES_H)
 	$(CXX) $< $(ZYN_CXX_FLAGS) -c -o $@
 
-zynaddsubfx-%.cpp.o: zynaddsubfx-%.cpp $(CXXDEPS) $(ZYN_UI_FILES_H)
+zynaddsubfx-ui.cpp.o: zynaddsubfx-ui.cpp $(ZYN_UI_FILES_H) $(ZYN_UI_FILES_CPP)
 	$(CXX) $< $(ZYN_CXX_FLAGS) -c -o $@
 
 zynaddsubfx/UI/%.cpp: zynaddsubfx/UI/%.fl
@@ -234,17 +235,11 @@ zynaddsubfx/UI/%.h: zynaddsubfx/UI/%.fl
 
 # --------------------------------------------------------------
 
-%.c.o: %.c
-	$(CC) $< $(BUILD_C_FLAGS) -c -o $@
-
-moc_%.cpp: %.hpp
-	$(MOC) $< -DMOC_PARSING -o $@
-
-# --------------------------------------------------------------
-
 clean:
-	rm -f $(OBJS) ../carla_native*.a ../libcarla_native.*
-	rm -f $(ZYN_UI_FILES_H) $(ZYN_UI_FILES_CPP)
+	$(RM) $(OBJS) ../carla_native*.a ../libcarla_native.*
+	$(RM) $(ZYN_UI_FILES_H) $(ZYN_UI_FILES_CPP)
 
 debug:
 	$(MAKE) DEBUG=true
+
+# --------------------------------------------------------------

source/modules/carla_native/resources/externalui.py

@@ -1 +1 @@
-/home/falktx/Personal/FOSS/GIT/Carla/source/externalui.py
+../../../externalui.py

source/modules/distrho/dgl/Makefile

@@ -90,19 +90,24 @@ win64:   ../../dgl.win64.a
 # --------------------------------------------------------------
 
 ../../dgl.a: $(OBJS)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../../dgl.posix32.a: $(OBJS_posix32)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../../dgl.posix64.a: $(OBJS_posix64)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../../dgl.win32.a: $(OBJS_win32)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../../dgl.win64.a: $(OBJS_win64)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../../libdgl.dll: $(OBJS)
 	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
@@ -136,7 +141,9 @@ win64:   ../../dgl.win64.a
 # --------------------------------------------------------------
 
 clean:
-	rm -f *.o src/*.o src/pugl/*.o ../../dgl*.a ../../libdgl.*
+	$(RM) src/*.o src/pugl/*.o ../../dgl*.a ../../libdgl.*
 
 debug:
 	$(MAKE) DEBUG=true
+
+# --------------------------------------------------------------

source/modules/jackbridge/Makefile

@@ -12,9 +12,6 @@ WINECXX ?= wineg++
 
 BUILD_CXX_FLAGS += $(JACKBRIDGE_FLAGS) -I. -I../../includes -I../../utils
 LINK_FLAGS      += $(JACKBRIDGE_LIBS)
-# linux: -ldl -lpthread -lrt
-# mac: -ldl -lpthread
-# win: -lpthread
 
 OBJS         = JackBridge1.cpp.o         JackBridge2.cpp.o
 OBJS_posix32 = JackBridge1.cpp.posix32.o JackBridge2.cpp.posix32.o
@@ -34,23 +31,23 @@ win64:   ../jackbridge.win64.a
 # --------------------------------------------------------------
 
 ../jackbridge.a: $(OBJS)
-	rm -f $@
+	$(RM) $@
 	$(AR) crs $@ $^
 
 ../jackbridge.posix32.a: $(OBJS_posix32)
-	rm -f $@
+	$(RM) $@
 	$(AR) crs $@ $^
 
 ../jackbridge.posix64.a: $(OBJS_posix64)
-	rm -f $@
+	$(RM) $@
 	$(AR) crs $@ $^
 
 ../jackbridge.win32.a: $(OBJS_win32)
-	rm -f $@
+	$(RM) $@
 	$(AR) crs $@ $^
 
 ../jackbridge.win64.a: $(OBJS_win64)
-	rm -f $@
+	$(RM) $@
 	$(AR) crs $@ $^
 
 ../libjackbridge.dll: $(OBJS)
@@ -82,7 +79,7 @@ win64:   ../jackbridge.win64.a
 # --------------------------------------------------------------
 
 clean:
-	rm -f *.o ../jackbridge*.a ../libjackbridge.*
+	$(RM) *.o ../jackbridge*.a ../libjackbridge.*
 
 debug:
 	$(MAKE) DEBUG=true

source/modules/juce_audio_basics/Makefile

@@ -37,19 +37,24 @@ win64:   ../juce_audio_basics.win64.a
 # --------------------------------------------------------------
 
 ../juce_audio_basics.a: $(OBJS)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../juce_audio_basics.posix32.a: $(OBJS_posix32)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../juce_audio_basics.posix64.a: $(OBJS_posix64)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../juce_audio_basics.win32.a: $(OBJS_win32)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../juce_audio_basics.win64.a: $(OBJS_win64)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../libjuce_audio_basics.dll: $(OBJS)
 	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
@@ -83,7 +88,9 @@ win64:   ../juce_audio_basics.win64.a
 # --------------------------------------------------------------
 
 clean:
-	rm -f *.o ../juce_audio_basics*.a ../libjuce_audio_basics.*
+	$(RM) *.o ../juce_audio_basics*.a ../libjuce_audio_basics.*
 
 debug:
 	$(MAKE) DEBUG=true
+
+# --------------------------------------------------------------

source/modules/juce_audio_devices/Makefile

@@ -41,19 +41,24 @@ win64:   ../juce_audio_devices.win64.a
 # --------------------------------------------------------------
 
 ../juce_audio_devices.a: $(OBJS)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../juce_audio_devices.posix32.a: $(OBJS_posix32)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../juce_audio_devices.posix64.a: $(OBJS_posix64)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../juce_audio_devices.win32.a: $(OBJS_win32)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../juce_audio_devices.win64.a: $(OBJS_win64)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../libjuce_audio_devices.dll: $(OBJS)
 	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
@@ -87,7 +92,9 @@ win64:   ../juce_audio_devices.win64.a
 # --------------------------------------------------------------
 
 clean:
-	rm -f *.o ../juce_audio_devices*.a ../libjuce_audio_devices.*
+	$(RM) *.o ../juce_audio_devices*.a ../libjuce_audio_devices.*
 
 debug:
 	$(MAKE) DEBUG=true
+
+# --------------------------------------------------------------

source/modules/juce_audio_formats/Makefile

@@ -37,19 +37,24 @@ win64:   ../juce_audio_formats.win64.a
 # --------------------------------------------------------------
 
 ../juce_audio_formats.a: $(OBJS)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../juce_audio_formats.posix32.a: $(OBJS_posix32)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../juce_audio_formats.posix64.a: $(OBJS_posix64)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../juce_audio_formats.win32.a: $(OBJS_win32)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../juce_audio_formats.win64.a: $(OBJS_win64)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../libjuce_audio_formats.dll: $(OBJS)
 	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
@@ -83,7 +88,9 @@ win64:   ../juce_audio_formats.win64.a
 # --------------------------------------------------------------
 
 clean:
-	rm -f *.o ../juce_audio_formats*.a ../libjuce_audio_formats.*
+	$(RM) *.o ../juce_audio_formats*.a ../libjuce_audio_formats.*
 
 debug:
 	$(MAKE) DEBUG=true
+
+# --------------------------------------------------------------

source/modules/juce_audio_processors/Makefile

@@ -9,7 +9,7 @@ include ../../Makefile.mk
 # --------------------------------------------------------------
 
 BUILD_CXX_FLAGS += $(JUCE_AUDIO_PROCESSORS_FLAGS) -I.
-LINK_FLAGS      += $(JUCE_AUDIO_PROCESSORS_LIBS)
+LINK_FLAGS      += $(JUCE_AUDIO_PROCESSORS_LIBS) -L.. -ljuce_audio_basics -ljuce_gui_basics -ljuce_graphics -ljuce_data_structures -ljuce_events -ljuce_core
 
 ifeq ($(MACOS),true)
 BUILD_CXX_FLAGS += -objc++
@@ -37,19 +37,24 @@ win64:   ../juce_audio_processors.win64.a
 # --------------------------------------------------------------
 
 ../juce_audio_processors.a: $(OBJS)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../juce_audio_processors.posix32.a: $(OBJS_posix32)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../juce_audio_processors.posix64.a: $(OBJS_posix64)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../juce_audio_processors.win32.a: $(OBJS_win32)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../juce_audio_processors.win64.a: $(OBJS_win64)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../libjuce_audio_processors.dll: $(OBJS)
 	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
@@ -83,7 +88,9 @@ win64:   ../juce_audio_processors.win64.a
 # --------------------------------------------------------------
 
 clean:
-	rm -f *.o ../juce_audio_processors*.a ../libjuce_audio_processors.*
+	$(RM) *.o ../juce_audio_processors*.a ../libjuce_audio_processors.*
 
 debug:
 	$(MAKE) DEBUG=true
+
+# --------------------------------------------------------------

source/modules/juce_audio_processors/juce_audio_processors.cpp

@@ -37,7 +37,10 @@
 
 #include "../juce_core/native/juce_BasicNativeHeaders.h"
 #include "juce_audio_processors.h"
-#include "../juce_gui_extra/juce_gui_extra.h"
+
+#if JUCE_MODULE_AVAILABLE_juce_gui_extra
+ #include "../juce_gui_extra/juce_gui_extra.h"
+#endif
 
 //==============================================================================
 #if JUCE_MAC

source/modules/juce_core/Makefile

@@ -37,19 +37,24 @@ win64:   ../juce_core.win64.a
 # --------------------------------------------------------------
 
 ../juce_core.a: $(OBJS)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../juce_core.posix32.a: $(OBJS_posix32)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../juce_core.posix64.a: $(OBJS_posix64)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../juce_core.win32.a: $(OBJS_win32)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../juce_core.win64.a: $(OBJS_win64)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../libjuce_core.dll: $(OBJS)
 	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
@@ -83,7 +88,9 @@ win64:   ../juce_core.win64.a
 # --------------------------------------------------------------
 
 clean:
-	rm -f *.o ../juce_core*.a ../libjuce_core.*
+	$(RM) *.o ../juce_core*.a ../libjuce_core.*
 
 debug:
 	$(MAKE) DEBUG=true
+
+# --------------------------------------------------------------

source/modules/juce_data_structures/Makefile

@@ -37,19 +37,24 @@ win64:   ../juce_data_structures.win64.a
 # --------------------------------------------------------------
 
 ../juce_data_structures.a: $(OBJS)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../juce_data_structures.posix32.a: $(OBJS_posix32)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../juce_data_structures.posix64.a: $(OBJS_posix64)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../juce_data_structures.win32.a: $(OBJS_win32)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../juce_data_structures.win64.a: $(OBJS_win64)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../libjuce_data_structures.dll: $(OBJS)
 	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
@@ -83,7 +88,9 @@ win64:   ../juce_data_structures.win64.a
 # --------------------------------------------------------------
 
 clean:
-	rm -f *.o ../juce_data_structures*.a ../libjuce_data_structures.*
+	$(RM) *.o ../juce_data_structures*.a ../libjuce_data_structures.*
 
 debug:
 	$(MAKE) DEBUG=true
+
+# --------------------------------------------------------------

source/modules/juce_events/Makefile

@@ -37,19 +37,24 @@ win64:   ../juce_events.win64.a
 # --------------------------------------------------------------
 
 ../juce_events.a: $(OBJS)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../juce_events.posix32.a: $(OBJS_posix32)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../juce_events.posix64.a: $(OBJS_posix64)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../juce_events.win32.a: $(OBJS_win32)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../juce_events.win64.a: $(OBJS_win64)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../libjuce_events.dll: $(OBJS)
 	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
@@ -83,7 +88,9 @@ win64:   ../juce_events.win64.a
 # --------------------------------------------------------------
 
 clean:
-	rm -f *.o ../juce_events*.a ../libjuce_events.*
+	$(RM) *.o ../juce_events*.a ../libjuce_events.*
 
 debug:
 	$(MAKE) DEBUG=true
+
+# --------------------------------------------------------------

source/modules/juce_graphics/Makefile

@@ -37,19 +37,24 @@ win64:   ../juce_graphics.win64.a
 # --------------------------------------------------------------
 
 ../juce_graphics.a: $(OBJS)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../juce_graphics.posix32.a: $(OBJS_posix32)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../juce_graphics.posix64.a: $(OBJS_posix64)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../juce_graphics.win32.a: $(OBJS_win32)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../juce_graphics.win64.a: $(OBJS_win64)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../libjuce_graphics.dll: $(OBJS)
 	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
@@ -83,7 +88,9 @@ win64:   ../juce_graphics.win64.a
 # --------------------------------------------------------------
 
 clean:
-	rm -f *.o ../juce_graphics*.a ../libjuce_graphics.*
+	$(RM) *.o ../juce_graphics*.a ../libjuce_graphics.*
 
 debug:
 	$(MAKE) DEBUG=true
+
+# --------------------------------------------------------------

source/modules/juce_gui_basics/Makefile

@@ -37,19 +37,24 @@ win64:   ../juce_gui_basics.win64.a
 # --------------------------------------------------------------
 
 ../juce_gui_basics.a: $(OBJS)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../juce_gui_basics.posix32.a: $(OBJS_posix32)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../juce_gui_basics.posix64.a: $(OBJS_posix64)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../juce_gui_basics.win32.a: $(OBJS_win32)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../juce_gui_basics.win64.a: $(OBJS_win64)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../libjuce_gui_basics.dll: $(OBJS)
 	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
@@ -83,7 +88,9 @@ win64:   ../juce_gui_basics.win64.a
 # --------------------------------------------------------------
 
 clean:
-	rm -f *.o ../juce_gui_basics*.a ../libjuce_gui_basics.*
+	$(RM) *.o ../juce_gui_basics*.a ../libjuce_gui_basics.*
 
 debug:
 	$(MAKE) DEBUG=true
+
+# --------------------------------------------------------------

source/modules/lilv/Makefile

@@ -13,8 +13,8 @@ SORD_VERSION   = 0.12.0
 SRATOM_VERSION = 0.4.2
 LILV_VERSION   = 0.16.0
 
-BUILD_C_FLAGS += -w
-BUILD_C_FLAGS += -Iconfig -I../../includes
+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
@@ -22,10 +22,6 @@ OBJS_posix64 = serd.c.posix64.o sord.c.posix64.o sratom.c.posix64.o lilv.c.posix
 OBJS_win32   = serd.c.win32.o   sord.c.win32.o   sratom.c.win32.o   lilv.c.win32.o
 OBJS_win64   = serd.c.win64.o   sord.c.win64.o   sratom.c.win64.o   lilv.c.win64.o
 
-ifneq ($(WIN32),true)
-LINK_FLAGS += -ldl
-endif
-
 # --------------------------------------------------------------
 
 all: ../lilv.a
@@ -38,28 +34,33 @@ win64:   ../lilv.win64.a
 # --------------------------------------------------------------
 
 ../lilv.a: $(OBJS)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../lilv.posix32.a: $(OBJS_posix32)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../lilv.posix64.a: $(OBJS_posix64)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../lilv.win32.a: $(OBJS_win32)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../lilv.win64.a: $(OBJS_win64)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../liblilv.dll: $(OBJS)
-	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
+	$(CC) $^ -shared $(LINK_FLAGS) -o $@
 
 ../liblilv.dylib: $(OBJS)
-	$(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@
+	$(CC) $^ -dynamiclib $(LINK_FLAGS) -o $@
 
 ../liblilv.so: $(OBJS)
-	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
+	$(CC) $^ -shared $(LINK_FLAGS) -o $@
 
 # --------------------------------------------------------------
 
@@ -106,7 +107,9 @@ lilv.c.%64.o: lilv.c
 # --------------------------------------------------------------
 
 clean:
-	rm -f *.o ../lilv*.a ../liblilv.*
+	$(RM) *.o ../lilv*.a ../liblilv.*
 
 debug:
 	$(MAKE) DEBUG=true
+
+# --------------------------------------------------------------

source/modules/rtaudio/Makefile

@@ -23,39 +23,12 @@ endif
 
 # --------------------------------------------------------------
 
-ifeq ($(DEBUG),true)
-BUILD_CXX_FLAGS += -D__RTAUDIO_DEBUG__
-endif
-
-ifeq ($(HAVE_ALSA),true)
-BUILD_CXX_FLAGS += $(shell pkg-config --cflags alsa) -D__LINUX_ALSA__
-endif
-
-ifeq ($(HAVE_PULSEAUDIO),true)
-BUILD_CXX_FLAGS += $(shell pkg-config --cflags libpulse-simple) -D__LINUX_PULSE__
-endif
-
-ifeq ($(MACOS),true)
-BUILD_CXX_FLAGS += -D__MACOSX_CORE__
-endif
-
-ifeq ($(WIN32),true)
-BUILD_CXX_FLAGS += -D__WINDOWS_ASIO__ -D__WINDOWS_DS__
-endif
-
-# --------------------------------------------------------------
-
 all: ../rtaudio.a
 
-posix32: ../rtaudio.posix32.a
-posix64: ../rtaudio.posix64.a
-win32:   ../rtaudio.win32.a
-win64:   ../rtaudio.win64.a
-
 # --------------------------------------------------------------
 
 ../rtaudio.a: $(OBJS)
-	rm -f $@
+	$(RM) $@
 	$(AR) crs $@ $^
 
 ../librtaudio.dll: $(OBJS)
@@ -75,7 +48,7 @@ win64:   ../rtaudio.win64.a
 # --------------------------------------------------------------
 
 clean:
-	rm -f *.o ../rtaudio*.a ../librtaudio.*
+	$(RM) *.o ../rtaudio*.a ../librtaudio.*
 
 debug:
 	$(MAKE) DEBUG=true

source/modules/rtmempool/Makefile

@@ -8,14 +8,13 @@ include ../../Makefile.mk
 
 # --------------------------------------------------------------
 
-BUILD_C_FLAGS += -I. -I../../includes
+BUILD_C_FLAGS += $(RTMEMPOOL_FLAGS) -I. -I../../includes
+LINK_FLAGS    += $(RTMEMPOOL_LIBS)
 
 ifeq ($(CARLA_PLUGIN_SUPPORT),true)
 BUILD_C_FLAGS += -DWANT_LV2
 endif
 
-LINK_FLAGS    += -lpthread
-
 OBJS         = rtmempool.c.o
 OBJS_posix32 = rtmempool.c.posix32.o
 OBJS_posix64 = rtmempool.c.posix64.o
@@ -34,28 +33,33 @@ win64:   ../rtmempool.win64.a
 # --------------------------------------------------------------
 
 ../rtmempool.a: $(OBJS)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../rtmempool.posix32.a: $(OBJS_posix32)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../rtmempool.posix64.a: $(OBJS_posix64)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../rtmempool.win32.a: $(OBJS_win32)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../rtmempool.win64.a: $(OBJS_win64)
-	$(AR) rs $@ $^
+	$(RM) $@
+	$(AR) crs $@ $^
 
 ../librtmempool.dll: $(OBJS)
-	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
+	$(CC) $^ -shared $(LINK_FLAGS) -o $@
 
 ../librtmempool.dylib: $(OBJS)
-	$(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@
+	$(CC) $^ -dynamiclib $(LINK_FLAGS) -o $@
 
 ../librtmempool.so: $(OBJS)
-	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
+	$(CC) $^ -shared $(LINK_FLAGS) -o $@
 
 # --------------------------------------------------------------
 
@@ -77,7 +81,9 @@ win64:   ../rtmempool.win64.a
 # --------------------------------------------------------------
 
 clean:
-	rm -f *.o ../rtmempool*.a ../librtmempool.*
+	$(RM) *.o ../rtmempool*.a ../librtmempool.*
 
 debug:
 	$(MAKE) DEBUG=true
+
+# --------------------------------------------------------------

source/modules/rtmidi/Makefile

@@ -0,0 +1,48 @@
+#!/usr/bin/make -f
+# Makefile for rtmidi #
+# ------------------- #
+# Created by falkTX
+#
+
+include ../../Makefile.mk
+
+# --------------------------------------------------------------
+
+BUILD_CXX_FLAGS += $(RTMIDI_FLAGS) -I. -Iinclude -I.. -I../../includes
+LINK_FLAGS      += $(RTMIDI_LIBS)
+
+OBJS = RtMidi.cpp.o
+
+# --------------------------------------------------------------
+
+all: ../rtmidi.a
+
+# --------------------------------------------------------------
+
+../rtmidi.a: $(OBJS)
+	$(RM) $@
+	$(AR) crs $@ $^
+
+../librtmidi.dll: $(OBJS)
+	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
+
+../librtmidi.dylib: $(OBJS)
+	$(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@
+
+../librtmidi.so: $(OBJS)
+	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
+
+# --------------------------------------------------------------
+
+%.cpp.o: %.cpp
+	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
+
+# --------------------------------------------------------------
+
+clean:
+	$(RM) *.o ../rtmidi*.a ../librtmidi.*
+
+debug:
+	$(MAKE) DEBUG=true
+
+# --------------------------------------------------------------

source/modules/theme/Makefile

@@ -82,8 +82,6 @@ OBJS_win64 = \
 
 # --------------------------------------------------------------
 
-
-
 ifeq ($(WIN32),true)
 CARLASTYLE = styles/carlastyle.dll
 else
@@ -105,27 +103,27 @@ win64:   ../theme.win64.a
 # --------------------------------------------------------------
 
 ../theme.a: $(FILES) $(OBJS)
-	rm -f $@
+	$(RM) $@
 	$(AR) crs $@ $(OBJS)
 
 ../theme.qt4.a: $(FILES_qt4) $(OBJS_qt4)
-	rm -f $@
+	$(RM) $@
 	$(AR) crs $@ $(OBJS_qt4)
 
 ../theme.posix32.a: $(FILES) $(OBJS_posix32)
-	rm -f $@
+	$(RM) $@
 	$(AR) crs $@ $(OBJS_posix32)
 
 ../theme.posix64.a: $(FILES) $(OBJS_posix64)
-	rm -f $@
+	$(RM) $@
 	$(AR) crs $@ $(OBJS_posix64)
 
 ../theme.win32.a: $(FILES) $(OBJS_win32)
-	rm -f $@
+	$(RM) $@
 	$(AR) crs $@ $(OBJS_win32)
 
 ../theme.win64.a: $(FILES) $(OBJS_win64)
-	rm -f $@
+	$(RM) $@
 	$(AR) crs $@ $(OBJS_win64)
 
 # --------------------------------------------------------------
@@ -174,7 +172,7 @@ resources.qt4.cpp: ../../../resources/resources-theme.qrc
 # --------------------------------------------------------------
 
 clean:
-	rm -f *.o ../theme*.a $(CARLASTYLE) $(FILES)
+	$(RM) *.o ../theme*.a $(CARLASTYLE) $(FILES)
 
 debug:
 	$(MAKE) DEBUG=true
@@ -182,3 +180,5 @@ debug:
 install: $(CARLASTYLE) styles/carlastyle.json
 	install -d $(QT_STYLES_DIR)
 	install -m 644 $^ $(QT_STYLES_DIR)
+
+# --------------------------------------------------------------

source/modules/widgets/Makefile

@@ -42,7 +42,8 @@ all: ../widgets.a
 # --------------------------------------------------------------
 
 ../widgets.a: $(FILES) $(OBJS)
-	$(AR) rs $@ $(OBJS)
+	$(RM) $@
+	$(AR) crs $@ $(OBJS)
 
 # --------------------------------------------------------------
 
@@ -58,7 +59,9 @@ moc_%.cpp: %.hpp
 # --------------------------------------------------------------
 
 clean:
-	rm -f *.o ../widgets*.a $(FILES)
+	$(RM) *.o ../widgets*.a $(FILES)
 
 debug:
 	$(MAKE) DEBUG=true
+
+# --------------------------------------------------------------

source/plugin/Makefile

@@ -45,10 +45,6 @@ endif
 # --------------------------------------------------------------
 # Native
 
-ifeq ($(HAVE_OPENGL),true)
-LINK_FLAGS += $(shell pkg-config --libs gl)
-endif
-
 ifeq ($(HAVE_AF_DEPS),true)
 LINK_FLAGS += $(shell pkg-config --libs sndfile)
 ifeq ($(HAVE_FFMPEG),true)
@@ -63,12 +59,12 @@ endif
 ifeq ($(HAVE_ZYN_DEPS),true)
 LINK_FLAGS += $(shell pkg-config --libs fftw3 mxml zlib)
 ifeq ($(HAVE_ZYN_UI_DEPS),true)
-LINK_FLAGS += $(shell pkg-config --libs ntk_images ntk) -lfreetype # FIXME
+LINK_FLAGS += $(shell pkg-config --libs ntk_images ntk)
 endif
 endif
 
 # --------------------------------------------------------------
-# Juce
+# Libs
 
 LINK_FLAGS += $(JUCE_AUDIO_BASICS_LIBS)
 LINK_FLAGS += $(JUCE_CORE_LIBS)
@@ -76,6 +72,15 @@ LINK_FLAGS += $(JUCE_DATA_STRUCTURES_LIBS)
 LINK_FLAGS += $(JUCE_EVENTS_LIBS)
 LINK_FLAGS += $(JUCE_GRAPHICS_LIBS)
 LINK_FLAGS += $(JUCE_GUI_BASICS_LIBS)
+LINK_FLAGS += $(RTMEMPOOL_LIBS)
+
+ifeq ($(HAVE_OPENGL),true)
+LINK_FLAGS += $(DGL_LIBS)
+endif
+
+ifeq ($(CARLA_PLUGIN_SUPPORT),true)
+LINK_FLAGS += $(LILV_LIBS)
+endif
 
 # --------------------------------------------------------------
 
@@ -88,24 +93,23 @@ LIBS += ../modules/juce_graphics.a
 LIBS += ../modules/juce_gui_basics.a
 LIBS += ../modules/rtmempool.a
 
-# ifeq ($(CARLA_PLUGIN_SUPPORT),true)
-# LIBS += ../modules/lilv.a
-# endif
-
 ifeq ($(HAVE_OPENGL),true)
 LIBS += ../modules/dgl.a
 endif
 
+ifeq ($(CARLA_PLUGIN_SUPPORT),true)
+LIBS += ../modules/lilv.a
+endif
+
+# --------------------------------------------------------------
+
 ifeq ($(WIN32),true)
-TARGETS  = carla-native-lv2-export.exe
-TARGETS += carla-native.lv2/carla-native.dll
+TARGETS = carla-native-lv2-export.exe carla-native.lv2/carla-native.dll
 else
-TARGETS  = carla-native-lv2-export
 ifeq ($(MACOS),true)
-TARGETS += carla-native.lv2/carla-native.dylib
+TARGETS = carla-native-lv2-export carla-native.lv2/carla-native.dylib
 else
-LIBS    += -ldl -lpthread -lrt
-TARGETS += carla-native.lv2/carla-native.so
+TARGETS = carla-native-lv2-export carla-native.lv2/carla-native.so
 endif
 endif
 
@@ -114,8 +118,8 @@ endif
 all: $(TARGETS)
 
 clean:
-	rm -f $(TARGETS) *.o
-	rm -f carla-native.lv2/*.*
+	$(RM) $(TARGETS) *.o
+	$(RM) carla-native.lv2/*.*
 
 debug:
 	$(MAKE) DEBUG=true
@@ -133,6 +137,16 @@ carla-native-lv2-export.cpp.o: carla-native-lv2-export.cpp carla-native-base.cpp
 
 # --------------------------------------------------------------
 
+carla-native-lv2-export: carla-native-lv2-export.cpp.o $(LIBS)
+	$(CXX) $^ $(LINK_FLAGS) -o $@
+	./carla-native-lv2-export
+
+carla-native-lv2-export.exe: carla-native-lv2-export.cpp.o $(LIBS)
+	$(CXX) $^ $(LINK_FLAGS) -o $@
+	./carla-native-lv2-export.exe
+
+# --------------------------------------------------------------
+
 carla-native.lv2/carla-native.dll: carla-native-lv2.cpp.o $(LIBS)
 	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
 
@@ -142,14 +156,6 @@ carla-native.lv2/carla-native.dylib: carla-native-lv2.cpp.o $(LIBS)
 carla-native.lv2/carla-native.so: carla-native-lv2.cpp.o $(LIBS)
 	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
 
-carla-native-lv2-export: carla-native-lv2-export.cpp.o $(LIBS)
-	$(CXX) $^ $(LINK_FLAGS) -o $@
-	./carla-native-lv2-export
-
-carla-native-lv2-export.exe: carla-native-lv2-export.cpp.o $(LIBS)
-	$(CXX) $^ $(LINK_FLAGS) -o $@
-	./carla-native-lv2-export.exe
-
 # --------------------------------------------------------------
 
 .FORCE:
@@ -157,3 +163,5 @@ carla-native-lv2-export.exe: carla-native-lv2-export.cpp.o $(LIBS)
 
 ../modules/%.a: .FORCE
 	$(MAKE) -C ../modules $*
+
+# --------------------------------------------------------------