diff options
| author | David Robillard <d@drobilla.net> | 2007-07-29 17:20:23 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-07-29 17:20:23 +0000 |
| commit | c63ecb743cbfec4393bb6f4caa98ee87e753dce8 (patch) | |
| tree | 2bf952f512dbd149ec73077942b701c344104305 /src/libs/module | |
| parent | 26e10071914fe3ba3e2f168df85b2935884b44b7 (diff) | |
| download | ingen-c63ecb743cbfec4393bb6f4caa98ee87e753dce8.tar.gz ingen-c63ecb743cbfec4393bb6f4caa98ee87e753dce8.tar.bz2 ingen-c63ecb743cbfec4393bb6f4caa98ee87e753dce8.zip | |
Build system fixes, building from top level doesn't recursively configure slv2, but slv2 is still independently packageable/buildable.
Think I've finally figured out how to do recursive autohell without resorting to suicide...
git-svn-id: http://svn.drobilla.net/lad/ingen@650 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs/module')
| -rw-r--r-- | src/libs/module/Makefile.am | 2 | ||||
| -rw-r--r-- | src/libs/module/World.hpp | 2 | ||||
| -rw-r--r-- | src/libs/module/module.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
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 |