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/progs | |
| 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/progs')
| -rw-r--r-- | src/progs/ingen/Makefile.am | 2 | ||||
| -rw-r--r-- | src/progs/ingen/main.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
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> |