diff options
31 files changed, 31 insertions, 35 deletions
diff --git a/src/libs/client/NodeModel.cpp b/src/libs/client/NodeModel.cpp index a910d67e..3ba343e3 100644 --- a/src/libs/client/NodeModel.cpp +++ b/src/libs/client/NodeModel.cpp @@ -15,7 +15,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "../../../config/config.h" +#include CONFIG_H_PATH #include "NodeModel.hpp" #include "PatchModel.hpp" diff --git a/src/libs/client/PluginModel.hpp b/src/libs/client/PluginModel.hpp index 63603687..a8d420b8 100644 --- a/src/libs/client/PluginModel.hpp +++ b/src/libs/client/PluginModel.hpp @@ -18,7 +18,7 @@ #ifndef PLUGINMODEL_H #define PLUGINMODEL_H -#include "../../../../config/config.h" +#include CONFIG_H_PATH #include <string> #include <iostream> #include <raul/Path.hpp> diff --git a/src/libs/engine/Engine.cpp b/src/libs/engine/Engine.cpp index c7e2ed8d..438d5540 100644 --- a/src/libs/engine/Engine.cpp +++ b/src/libs/engine/Engine.cpp @@ -22,7 +22,7 @@ #include <raul/Deletable.hpp> #include <raul/Maid.hpp> #include "Engine.hpp" -#include "../../../../config/config.h" +#include CONFIG_H_PATH #include "tuning.hpp" #include "Event.hpp" #include "JackAudioDriver.hpp" diff --git a/src/libs/engine/Engine.hpp b/src/libs/engine/Engine.hpp index fc64e024..7570e61f 100644 --- a/src/libs/engine/Engine.hpp +++ b/src/libs/engine/Engine.hpp @@ -18,7 +18,7 @@ #ifndef ENGINE_H #define ENGINE_H -#include "../../../config/config.h" +#include CONFIG_H_PATH #include "module/module.h" #include <cassert> diff --git a/src/libs/engine/JackAudioDriver.cpp b/src/libs/engine/JackAudioDriver.cpp index 25f8305d..a402bfe6 100644 --- a/src/libs/engine/JackAudioDriver.cpp +++ b/src/libs/engine/JackAudioDriver.cpp @@ -16,7 +16,7 @@ */ #include "JackAudioDriver.hpp" -#include "../../../../config/config.h" +#include CONFIG_H_PATH #include "tuning.hpp" #include <iostream> #include <cstdlib> diff --git a/src/libs/engine/JackMidiDriver.hpp b/src/libs/engine/JackMidiDriver.hpp index 631f0d28..c546fbec 100644 --- a/src/libs/engine/JackMidiDriver.hpp +++ b/src/libs/engine/JackMidiDriver.hpp @@ -21,7 +21,7 @@ #include <jack/jack.h> #include <jack/midiport.h> #include <raul/List.hpp> -#include "../../../../config/config.h" +#include CONFIG_H_PATH #include "MidiDriver.hpp" namespace Ingen { diff --git a/src/libs/engine/LashDriver.cpp b/src/libs/engine/LashDriver.cpp index f4f37abb..641599ff 100644 --- a/src/libs/engine/LashDriver.cpp +++ b/src/libs/engine/LashDriver.cpp @@ -18,7 +18,7 @@ #include <iostream> #include <string> #include <cassert> -#include "../../../../config/config.h" +#include CONFIG_H_PATH #include "LashDriver.hpp" #include "App.hpp" diff --git a/src/libs/engine/Makefile.am b/src/libs/engine/Makefile.am index d5bbede4..72cea433 100644 --- a/src/libs/engine/Makefile.am +++ b/src/libs/engine/Makefile.am @@ -6,8 +6,7 @@ moduledir = $(libdir)/ingen module_LTLIBRARIES = libingen_engine.la libingen_engine_la_CXXFLAGS = \ - -I$(top_srcdir)/slv2 \ - -I$(top_srcdir)/raul \ + @SLV2_CFLAGS@ @RAUL_CFLAGS@ \ -I$(top_srcdir)/ingen/src/common \ -I$(top_srcdir)/ingen/src/libs \ -I$(top_srcdir)/ingen/src/libs/engine/events \ diff --git a/src/libs/engine/NodeFactory.cpp b/src/libs/engine/NodeFactory.cpp index eab6336d..2c71d66d 100644 --- a/src/libs/engine/NodeFactory.cpp +++ b/src/libs/engine/NodeFactory.cpp @@ -16,7 +16,7 @@ */ #include "NodeFactory.hpp" -#include "../../../../config/config.h" +#include CONFIG_H_PATH #include <cstdlib> #include <pthread.h> #include <dirent.h> diff --git a/src/libs/engine/NodeFactory.hpp b/src/libs/engine/NodeFactory.hpp index e3f947f0..2c0b2bb6 100644 --- a/src/libs/engine/NodeFactory.hpp +++ b/src/libs/engine/NodeFactory.hpp @@ -18,7 +18,7 @@ #ifndef NODEFACTORY_H #define NODEFACTORY_H -#include "../../../../config/config.h" +#include CONFIG_H_PATH #include "module/module.h" #include <list> diff --git a/src/libs/engine/OSCEngineReceiver.hpp b/src/libs/engine/OSCEngineReceiver.hpp index 478af249..a9e76ece 100644 --- a/src/libs/engine/OSCEngineReceiver.hpp +++ b/src/libs/engine/OSCEngineReceiver.hpp @@ -18,7 +18,7 @@ #ifndef OSCENGINERECEIVER_H #define OSCENGINERECEIVER_H -#include "../../../../config/config.h" +#include CONFIG_H_PATH #include <string> #include <stdint.h> #include <lo/lo.h> diff --git a/src/libs/engine/Plugin.hpp b/src/libs/engine/Plugin.hpp index 21730797..aa51d725 100644 --- a/src/libs/engine/Plugin.hpp +++ b/src/libs/engine/Plugin.hpp @@ -18,7 +18,7 @@ #ifndef PLUGIN_H #define PLUGIN_H -#include "../../../../config/config.h" +#include CONFIG_H_PATH #include <cstdlib> #include <glibmm/module.h> diff --git a/src/libs/engine/QueuedEngineInterface.cpp b/src/libs/engine/QueuedEngineInterface.cpp index 68115d79..6055d8bd 100644 --- a/src/libs/engine/QueuedEngineInterface.cpp +++ b/src/libs/engine/QueuedEngineInterface.cpp @@ -16,7 +16,7 @@ */ #include "QueuedEngineInterface.hpp" -#include "../../../../config/config.h" +#include CONFIG_H_PATH #include "QueuedEventSource.hpp" #include "events.hpp" #include "Engine.hpp" diff --git a/src/libs/engine/engine.cpp b/src/libs/engine/engine.cpp index 53db86f8..17607fa1 100644 --- a/src/libs/engine/engine.cpp +++ b/src/libs/engine/engine.cpp @@ -15,7 +15,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "../../../../config/config.h" +#include CONFIG_H_PATH #include <raul/Process.hpp> #include "engine.hpp" diff --git a/src/libs/engine/events.hpp b/src/libs/engine/events.hpp index 0cfbbc86..84bde550 100644 --- a/src/libs/engine/events.hpp +++ b/src/libs/engine/events.hpp @@ -18,7 +18,7 @@ #ifndef EVENTS_H #define EVENTS_H -#include "../../../../config/config.h" +#include CONFIG_H_PATH #include "DeactivateEvent.hpp" #include "EnablePatchEvent.hpp" diff --git a/src/libs/engine/tests/Makefile.am b/src/libs/engine/tests/Makefile.am index 64fdd419..bb5e8a56 100644 --- a/src/libs/engine/tests/Makefile.am +++ b/src/libs/engine/tests/Makefile.am @@ -1,6 +1,6 @@ if BUILD_UNIT_TESTS -AM_CXXFLAGS = @JACK_CFLAGS@ @LIBLO_CFLAGS@ @ALSA_CFLAGS@ -I$(top_srcdir)/raul -I../../common +AM_CXXFLAGS = @JACK_CFLAGS@ @LIBLO_CFLAGS@ @ALSA_CFLAGS@ @RAUL_CFLAGS@ -I../../common common_ldadd = @JACK_LIBS@ @RAUL_LIBS@ @LIBLO_LIBS@ @ALSA_LIBS@ -lrt node_tree_test_LDADD = $(common_ldadd) diff --git a/src/libs/gui/App.cpp b/src/libs/gui/App.cpp index 7b1204d2..b0ec48af 100644 --- a/src/libs/gui/App.cpp +++ b/src/libs/gui/App.cpp @@ -15,7 +15,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "../../../config/config.h" +#include CONFIG_H_PATH #include "module/module.h" #include "App.hpp" #include <cassert> diff --git a/src/libs/gui/ConnectWindow.cpp b/src/libs/gui/ConnectWindow.cpp index cd1bb976..703d784e 100644 --- a/src/libs/gui/ConnectWindow.cpp +++ b/src/libs/gui/ConnectWindow.cpp @@ -22,7 +22,7 @@ #include <sys/time.h> #include <sys/resource.h> #include <raul/Process.hpp> -#include "../../../../config/config.h" +#include CONFIG_H_PATH #include "interface/EngineInterface.hpp" #include "engine/tuning.hpp" #include "engine/Engine.hpp" diff --git a/src/libs/gui/ConnectWindow.hpp b/src/libs/gui/ConnectWindow.hpp index fe26d549..2ea86f0a 100644 --- a/src/libs/gui/ConnectWindow.hpp +++ b/src/libs/gui/ConnectWindow.hpp @@ -18,7 +18,7 @@ #ifndef CONNECT_WINDOW_H #define CONNECT_WINDOW_H -#include "../../../config/config.h" +#include CONFIG_H_PATH #ifdef HAVE_SLV2 #include <slv2/slv2.h> diff --git a/src/libs/gui/ControlGroups.cpp b/src/libs/gui/ControlGroups.cpp index d82fca13..2e31ed3f 100644 --- a/src/libs/gui/ControlGroups.cpp +++ b/src/libs/gui/ControlGroups.cpp @@ -15,7 +15,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "../../../config/config.h" +#include CONFIG_H_PATH #include <cmath> #include <iostream> diff --git a/src/libs/gui/LashController.cpp b/src/libs/gui/LashController.cpp index 8f288766..3a654100 100644 --- a/src/libs/gui/LashController.cpp +++ b/src/libs/gui/LashController.cpp @@ -15,8 +15,8 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include CONFIG_H_PATH #include "LashController.hpp" -#include "../../../../config/config.hpp" #include <iostream> #include <string> #include <cassert> diff --git a/src/libs/gui/Makefile.am b/src/libs/gui/Makefile.am index 3664e151..f3b2e3ae 100644 --- a/src/libs/gui/Makefile.am +++ b/src/libs/gui/Makefile.am @@ -12,9 +12,7 @@ moduledir = $(libdir)/ingen module_LTLIBRARIES = libingen_gui.la libingen_gui_la_CXXFLAGS = \ - -I$(top_srcdir)/slv2 \ - -I$(top_srcdir)/raul \ - -I$(top_srcdir)/flowcanvas \ + @SLV2_CFLAGS@ @RAUL_CFLAGS@ @FLOWCANVAS_CFLAGS@ \ -I$(top_srcdir)/ingen/src/common \ -I$(top_srcdir)/ingen/src/libs \ -DPKGDATADIR=\"$(pkgdatadir)\" \ diff --git a/src/libs/gui/PatchCanvas.cpp b/src/libs/gui/PatchCanvas.cpp index cbe931ab..0e591445 100644 --- a/src/libs/gui/PatchCanvas.cpp +++ b/src/libs/gui/PatchCanvas.cpp @@ -15,7 +15,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "../../../config/config.h" +#include CONFIG_H_PATH #include "module/module.h" #include <cassert> diff --git a/src/libs/gui/PatchCanvas.hpp b/src/libs/gui/PatchCanvas.hpp index d0df1505..3099df91 100644 --- a/src/libs/gui/PatchCanvas.hpp +++ b/src/libs/gui/PatchCanvas.hpp @@ -18,7 +18,7 @@ #ifndef PATCHCANVAS_H #define PATCHCANVAS_H -#include "../../../../config/config.h" +#include CONFIG_H_PATH #include <string> #include <map> diff --git a/src/libs/gui/gui.hpp b/src/libs/gui/gui.hpp index d99e4091..cc290851 100644 --- a/src/libs/gui/gui.hpp +++ b/src/libs/gui/gui.hpp @@ -18,7 +18,7 @@ #ifndef INGEN_GUI_H #define INGEN_GUI_H -#include "../../../config/config.h" +#include CONFIG_H_PATH #include "module/module.h" #include <raul/SharedPtr.hpp> diff --git a/src/libs/module/Makefile.am b/src/libs/module/Makefile.am index 803c17ac..baebfea5 100644 --- a/src/libs/module/Makefile.am +++ b/src/libs/module/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libingen_module.la -libingen_module_la_CXXFLAGS = -I$(top_srcdir)/raul -I$(top_srcdir)/slv2 -DINGEN_MODULE_DIR=\"$(libdir)/ingen\" @GLIBMM_CFLAGS@ +libingen_module_la_CXXFLAGS = @RAUL_CFLAGS@ @SLV2_CFLAGS@ @GLIBMM_CFLAGS@ -DINGEN_MODULE_DIR=\"$(libdir)/ingen\" libingen_module_la_LIBADD = @RAUL_LIBS@ @GLIBMM_LIBS@ @SLV2_LIBS@ diff --git a/src/libs/module/World.hpp b/src/libs/module/World.hpp index c809080b..bb7ffe17 100644 --- a/src/libs/module/World.hpp +++ b/src/libs/module/World.hpp @@ -23,7 +23,7 @@ #include <raul/SharedPtr.hpp> #include <raul/RDFWorld.hpp> -#include "../../../../config/config.h" +#include CONFIG_H_PATH #ifdef HAVE_SLV2 #include <slv2/slv2.h> diff --git a/src/libs/module/module.cpp b/src/libs/module/module.cpp index 7f1741df..80ed035b 100644 --- a/src/libs/module/module.cpp +++ b/src/libs/module/module.cpp @@ -18,7 +18,7 @@ #include "module.h" #include "World.hpp" -#include "../../../../config/config.h" +#include CONFIG_H_PATH #ifdef HAVE_SLV2 #include <slv2/slv2.h> #endif diff --git a/src/libs/serialisation/Makefile.am b/src/libs/serialisation/Makefile.am index 556ab653..eb56ebed 100644 --- a/src/libs/serialisation/Makefile.am +++ b/src/libs/serialisation/Makefile.am @@ -4,7 +4,7 @@ moduledir = $(libdir)/ingen module_LTLIBRARIES = libingen_serialisation.la -libingen_serialisation_la_CXXFLAGS = -I$(top_srcdir)/ingen/src/common -I$(top_srcdir)/raul @GLIBMM_CFLAGS@ +libingen_serialisation_la_CXXFLAGS = -I$(top_srcdir)/ingen/src/common @RAUL_CFLAGS@ @GLIBMM_CFLAGS@ libingen_serialisation_la_LDFLAGS = -no-undefined -module -avoid-version libingen_serialisation_la_LIBADD = @RAUL_LIBS@ @GLIBMM_LIBS@ diff --git a/src/progs/ingen/Makefile.am b/src/progs/ingen/Makefile.am index 9226d6aa..ff408ab2 100644 --- a/src/progs/ingen/Makefile.am +++ b/src/progs/ingen/Makefile.am @@ -1,4 +1,4 @@ -AM_CXXFLAGS = -I$(top_srcdir)/slv2 -I$(top_srcdir)/raul -I$(top_srcdir)/ingen/src/common -I$(top_srcdir)/ingen/src/libs -DINGEN_MODULE_DIR=\"$(libdir)/ingen\" @GTHREAD_CFLAGS@ @GLIBMM_CFLAGS@ +AM_CXXFLAGS = @GTHREAD_CFLAGS@ @GLIBMM_CFLAGS@ @RAUL_CFLAGS@ @SLV2_CFLAGS@ -I$(top_srcdir)/ingen/src/common -I$(top_srcdir)/ingen/src/libs -DINGEN_MODULE_DIR=\"$(libdir)/ingen\" MAINTAINERCLEANFILES = Makefile.in diff --git a/src/progs/ingen/main.cpp b/src/progs/ingen/main.cpp index 5f4070b9..1172c33a 100644 --- a/src/progs/ingen/main.cpp +++ b/src/progs/ingen/main.cpp @@ -15,8 +15,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "../../../../config/config.h" - +#include CONFIG_H_PATH #include <iostream> #include <string> #include <signal.h> |