summaryrefslogtreecommitdiffstats
path: root/src/ingen
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2008-09-30 17:43:50 +0000
committerDavid Robillard <d@drobilla.net>2008-09-30 17:43:50 +0000
commit7a855a56a1eabd1b46543eab424257c658ff770b (patch)
tree56c56869f76d280d8f4034b140bada62a7f6e008 /src/ingen
parentee26748673db8a28599a48f05741ad34581395b7 (diff)
downloadingen-7a855a56a1eabd1b46543eab424257c658ff770b.tar.gz
ingen-7a855a56a1eabd1b46543eab424257c658ff770b.tar.bz2
ingen-7a855a56a1eabd1b46543eab424257c658ff770b.zip
Fix building (both autohell and waf) with simpler ingen tree layout.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1553 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/ingen')
-rw-r--r--src/ingen/Makefile.am6
-rw-r--r--src/ingen/wscript2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/ingen/Makefile.am b/src/ingen/Makefile.am
index c48a47a2..8422b9e0 100644
--- a/src/ingen/Makefile.am
+++ b/src/ingen/Makefile.am
@@ -14,15 +14,15 @@ dist_desktopfiles_DATA = ingen.desktop
bin_PROGRAMS = ingen
ingen_LDADD = \
- ../../libs/module/libingen_module.la \
- ../../libs/shared/libingen_shared.la \
+ ../module/libingen_module.la \
+ ../shared/libingen_shared.la \
@SLV2_LIBS@ \
@REDLANDMM_LIBS@ \
@RAUL_LIBS@ \
@GTHREAD_LIBS@ \
@GLIBMM_LIBS@
-ingen_DEPENDENCIES = ../../libs/module/libingen_module.la
+ingen_DEPENDENCIES = ../module/libingen_module.la
ingen_SOURCES = \
main.cpp \
diff --git a/src/ingen/wscript b/src/ingen/wscript
index d2e42c51..c876ff1b 100644
--- a/src/ingen/wscript
+++ b/src/ingen/wscript
@@ -4,7 +4,7 @@ def build(bld):
obj = bld.create_obj('cpp', 'program')
obj.target = 'ingen'
obj.source = 'main.cpp cmdline.c'
- obj.includes = ['.', '../../common', '../..', '../../libs']
+ obj.includes = ['../common', '../']
obj.defines = 'VERSION=\\\"' + bld.env()['INGEN_VERSION'] + '\\\"'
obj.uselib = 'GTHREAD GLIBMM REDLANDMM RAUL SLV2 INGEN LIBLO'
obj.uselib_local = 'libingen_module libingen_shared'