From 972271f3f0b652744590391ed3c8f32abc2d35e2 Mon Sep 17 00:00:00 2001 From: falkTX Date: Thu, 16 Jan 2014 02:30:06 +0000 Subject: [PATCH] Start proper makefile dependency --- source/backend/Makefile.mk | 20 ++++++++++++++++++++ source/backend/engine/Makefile | 17 +++++++++-------- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/source/backend/Makefile.mk b/source/backend/Makefile.mk index b83e1bbcd..1575fa770 100644 --- a/source/backend/Makefile.mk +++ b/source/backend/Makefile.mk @@ -58,3 +58,23 @@ endif endif # -------------------------------------------------------------- + +CARLA_BACKEND_H = ../CarlaBackend.h $(CARLA_DEFINES_H) +CARLA_HOST_H = ../CarlaHost.h $(CARLA_BACKEND_H) +CARLA_ENGINE_HPP = ../CarlaEngine.hpp $(CARLA_BACKEND_H) +CARLA_PLUGIN_HPP = ../CarlaPlugin.hpp $(CARLA_BACKEND_H) + +CARLA_DEFINES_H = ../../includes/CarlaDefines.h +CARLA_MIDI_H = ../../includes/CarlaMIDI.h + +CARLA_UTILS_HPP = ../../utils/CarlaUtils.hpp $(CARLA_DEFINES_H) +CARLA_BACKEND_UTILS_HPP = ../../utils/CarlaBackendUtils.hpp $(CARLA_BACKEND_H) $(CARLA_HOST_H) $(CARLA_STRING_HPP) +CARLA_ENGINE_UTILS_HPP = ../../utils/CarlaEngineUtils.hpp $(CARLA_ENGINE_HPP) $(CARLA_UTILS_HPP) +CARLA_JUCE_UTILS_HPP = ../../utils/CarlaJuceUtils.hpp $(CARLA_UTILS_HPP) +CARLA_STATE_UTILS_HPP = ../../utils/CarlaStateUtils.hpp $(CARLA_BACKEND_UTILS_HPP) $(CARLA_MIDI_H) $(LINKED_LIST_HPP) + +CARLA_MUTEX_HPP = ../../utils/CarlaMutex.hpp $(CARLA_UTILS_HPP) +CARLA_STRING_HPP = ../../utils/CarlaString.hpp $(CARLA_JUCE_UTILS_HPP) +CARLA_THREAD_HPP = ../../utils/CarlaThread.hpp $(CARLA_MUTEX_HPP) $(CARLA_STRING_HPP) + +LINKED_LIST_HPP = ../../utils/LinkedList.hpp $(CARLA_UTILS_HPP) diff --git a/source/backend/engine/Makefile b/source/backend/engine/Makefile index 2ead5b41e..ab5298da5 100644 --- a/source/backend/engine/Makefile +++ b/source/backend/engine/Makefile @@ -30,10 +30,6 @@ OBJSp = $(OBJS) \ CarlaEngineNative.cpp.exp.o endif -HEADERS = \ - ../CarlaBackend.h ../CarlaEngine.hpp ../CarlaPlugin.hpp \ - CarlaEngineInternal.hpp CarlaEngineOsc.hpp CarlaEngineThread.hpp - TARGETa = ../carla_engine.a ifneq ($(WIN32),true) @@ -46,12 +42,9 @@ all: $(TARGETa) $(TARGETp) # -------------------------------------------------------------- -%.cpp.o: %.cpp $(HEADERS) +CarlaEngine.cpp.o: CarlaEngine.cpp $(CARLA_ENGINE_INTERNAL_HPP) $(CARLA_PLUGIN_HPP) $(CARLA_BACKEND_UTILS_HPP) $(CARLA_ENGINE_UTILS_HPP) $(CARLA_STATE_UTILS_HPP) $(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ -%.cpp.exp.o: %.cpp $(HEADERS) - $(CXX) $< $(BUILD_CXX_FLAGS) -DCARLA_PLUGIN_EXPORT -c -o $@ - CarlaEngineRtAudio.cpp.o: CarlaEngineRtAudio.cpp $(HEADERS) $(CXX) $< $(BUILD_CXX_FLAGS) $(RTAUDIO_FLAGS) $(RTMIDI_FLAGS) -c -o $@ @@ -72,3 +65,11 @@ debug: $(MAKE) DEBUG=true # -------------------------------------------------------------- + +CARLA_ENGINE_INTERNAL_HPP = CarlaEngineInternal.hpp CarlaEngineOsc.hpp CarlaEngineThread.hpp $(CARLA_ENGINE_HPP) $(CARLA_MUTEX_HPP) $(LINKED_LIST_HPP) + +# %.cpp.o: %.cpp $(HEADERS) +# $(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ +# +# %.cpp.exp.o: %.cpp $(HEADERS) +# $(CXX) $< $(BUILD_CXX_FLAGS) -DCARLA_PLUGIN_EXPORT -c -o $@