From 7a855a56a1eabd1b46543eab424257c658ff770b Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 30 Sep 2008 17:43:50 +0000 Subject: 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 --- src/ingen/Makefile.am | 6 +++--- src/ingen/wscript | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/ingen') 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' -- cgit v1.2.1