From 0f31f44094af436984d1b82e86443f1151c3e8bc Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 20 Oct 2008 00:25:32 +0000 Subject: Actually use installation location variables for everything. Add ./waf configure --build which builds a (soon-to-be) relocatable independent bundle with all data/progs/libs in it (OSX bundle directory structure, should be possible to make a 'real' OSX bundle out of this...). Fix include paths to use "" and definitely build against local versions of libraries. git-svn-id: http://svn.drobilla.net/lad/trunk/slv2@1689 a436a847-0d15-0410-975c-d299462d15a1 --- hosts/lv2_jack_host.c | 2 +- hosts/lv2_simple_jack_host.c | 2 +- slv2/lv2_ui.h | 2 +- slv2/plugin.h | 6 +++--- slv2/pluginclass.h | 2 +- slv2/pluginclasses.h | 2 +- slv2/plugininstance.h | 6 +++--- slv2/plugins.h | 4 ++-- slv2/pluginuiinstance.h | 4 ++-- slv2/pluginuis.h | 4 ++-- slv2/port.h | 8 ++++---- slv2/scalepoint.h | 2 +- slv2/scalepoints.h | 2 +- slv2/slv2.h | 30 +++++++++++++++--------------- slv2/value.h | 2 +- slv2/values.h | 2 +- slv2/world.h | 4 ++-- utils/lv2_inspect.c | 2 +- utils/lv2_list.c | 2 +- wscript | 6 ++++-- 20 files changed, 48 insertions(+), 46 deletions(-) diff --git a/hosts/lv2_jack_host.c b/hosts/lv2_jack_host.c index 4703ac8..b3548b8 100644 --- a/hosts/lv2_jack_host.c +++ b/hosts/lv2_jack_host.c @@ -23,9 +23,9 @@ #include #include #include -#include #include #include +#include "slv2/slv2.h" #include "lv2_uri_map.h" #include "lv2_event.h" #include "lv2_event_helpers.h" diff --git a/hosts/lv2_simple_jack_host.c b/hosts/lv2_simple_jack_host.c index 13ce5fa..32c852c 100644 --- a/hosts/lv2_simple_jack_host.c +++ b/hosts/lv2_simple_jack_host.c @@ -20,8 +20,8 @@ #include #include #include -#include #include +#include "slv2/slv2.h" /** This program's data */ diff --git a/slv2/lv2_ui.h b/slv2/lv2_ui.h index 4be2c24..c84a74e 100644 --- a/slv2/lv2_ui.h +++ b/slv2/lv2_ui.h @@ -161,7 +161,7 @@ #ifndef LV2_UI_H #define LV2_UI_H -#include +#include "lv2.h" #define LV2_UI_URI "http://lv2plug.in/ns/extensions/ui" diff --git a/slv2/plugin.h b/slv2/plugin.h index 5aebde1..39fd2c5 100644 --- a/slv2/plugin.h +++ b/slv2/plugin.h @@ -25,9 +25,9 @@ extern "C" { #include #include -#include -#include -#include +#include "slv2/types.h" +#include "slv2/port.h" +#include "slv2/values.h" /** \defgroup slv2_data Plugin data access * diff --git a/slv2/pluginclass.h b/slv2/pluginclass.h index 02fcbfb..2b19ac8 100644 --- a/slv2/pluginclass.h +++ b/slv2/pluginclass.h @@ -23,7 +23,7 @@ extern "C" { #endif -#include +#include "slv2/types.h" /** \addtogroup slv2_data * @{ diff --git a/slv2/pluginclasses.h b/slv2/pluginclasses.h index e998b22..5a13dbe 100644 --- a/slv2/pluginclasses.h +++ b/slv2/pluginclasses.h @@ -23,7 +23,7 @@ extern "C" { #endif -#include +#include "slv2/pluginclass.h" /** \addtogroup slv2_collections * @{ diff --git a/slv2/plugininstance.h b/slv2/plugininstance.h index 7c05468..a3af077 100644 --- a/slv2/plugininstance.h +++ b/slv2/plugininstance.h @@ -24,9 +24,9 @@ extern "C" { #endif #include -#include -#include -#include +#include "lv2.h" +#include "slv2/plugin.h" +#include "slv2/port.h" typedef struct _InstanceImpl* SLV2InstanceImpl; diff --git a/slv2/plugins.h b/slv2/plugins.h index e6257ac..095bdbb 100644 --- a/slv2/plugins.h +++ b/slv2/plugins.h @@ -23,8 +23,8 @@ extern "C" { #endif -#include -#include +#include "slv2/types.h" +#include "slv2/plugin.h" /** \addtogroup slv2_collections * @{ diff --git a/slv2/pluginuiinstance.h b/slv2/pluginuiinstance.h index beb9d6d..84ee690 100644 --- a/slv2/pluginuiinstance.h +++ b/slv2/pluginuiinstance.h @@ -24,8 +24,8 @@ extern "C" { #endif #include -#include -#include +#include "slv2/lv2_ui.h" +#include "slv2/plugin.h" typedef struct _SLV2UIInstanceImpl* SLV2UIInstanceImpl; diff --git a/slv2/pluginuis.h b/slv2/pluginuis.h index 315e260..6df49a0 100644 --- a/slv2/pluginuis.h +++ b/slv2/pluginuis.h @@ -23,8 +23,8 @@ extern "C" { #endif -#include -#include +#include "slv2/types.h" +#include "slv2/plugin.h" /** \addtogroup slv2_collections * diff --git a/slv2/port.h b/slv2/port.h index 1497884..b064b24 100644 --- a/slv2/port.h +++ b/slv2/port.h @@ -23,10 +23,10 @@ extern "C" { #endif -#include -#include -#include -#include +#include "slv2/types.h" +#include "slv2/plugin.h" +#include "slv2/port.h" +#include "slv2/values.h" /** \addtogroup slv2_data * @{ diff --git a/slv2/scalepoint.h b/slv2/scalepoint.h index 6f021b7..1fb6867 100644 --- a/slv2/scalepoint.h +++ b/slv2/scalepoint.h @@ -23,7 +23,7 @@ extern "C" { #endif -#include +#include "slv2/types.h" /** \addtogroup slv2_data * @{ diff --git a/slv2/scalepoints.h b/slv2/scalepoints.h index f8d53f9..fe1f121 100644 --- a/slv2/scalepoints.h +++ b/slv2/scalepoints.h @@ -24,7 +24,7 @@ extern "C" { #endif #include -#include +#include "slv2/value.h" /** \defgroup slv2_collections Collections of scale_points/objects * diff --git a/slv2/slv2.h b/slv2/slv2.h index 90dd2e1..a84165b 100644 --- a/slv2/slv2.h +++ b/slv2/slv2.h @@ -23,21 +23,21 @@ extern "C" { #endif -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "slv2/plugin.h" +#include "slv2/pluginclass.h" +#include "slv2/plugininstance.h" +#include "slv2/plugins.h" +#include "slv2/pluginui.h" +#include "slv2/pluginuiinstance.h" +#include "slv2/pluginuis.h" +#include "slv2/port.h" +#include "slv2/types.h" +#include "slv2/util.h" +#include "slv2/value.h" +#include "slv2/values.h" +#include "slv2/scalepoint.h" +#include "slv2/scalepoints.h" +#include "slv2/world.h" #ifdef __cplusplus } /* extern "C" */ diff --git a/slv2/value.h b/slv2/value.h index 4beef14..f7e9eca 100644 --- a/slv2/value.h +++ b/slv2/value.h @@ -24,7 +24,7 @@ extern "C" { #endif #include -#include +#include "slv2/types.h" /** \addtogroup slv2_data * @{ diff --git a/slv2/values.h b/slv2/values.h index 474323d..b0ec3e3 100644 --- a/slv2/values.h +++ b/slv2/values.h @@ -24,7 +24,7 @@ extern "C" { #endif #include -#include +#include "slv2/value.h" /** \defgroup slv2_collections Collections of values/objects * diff --git a/slv2/world.h b/slv2/world.h index 268251e..6028ca8 100644 --- a/slv2/world.h +++ b/slv2/world.h @@ -23,9 +23,9 @@ extern "C" { #endif -#include -#include #include +#include "slv2/plugins.h" +#include "slv2/pluginclasses.h" /** \defgroup slv2_world Global library state * diff --git a/utils/lv2_inspect.c b/utils/lv2_inspect.c index 04db2ac..1a710ed 100644 --- a/utils/lv2_inspect.c +++ b/utils/lv2_inspect.c @@ -21,8 +21,8 @@ #include #include #include -#include #include +#include "slv2/slv2.h" SLV2Value event_class = NULL; SLV2Value control_class = NULL; diff --git a/utils/lv2_list.c b/utils/lv2_list.c index dc9614f..14aa5a9 100644 --- a/utils/lv2_list.c +++ b/utils/lv2_list.c @@ -19,7 +19,7 @@ #include "config.h" #include #include -#include +#include "slv2/slv2.h" void diff --git a/wscript b/wscript index db891f7..cfa8416 100644 --- a/wscript +++ b/wscript @@ -36,7 +36,6 @@ blddir = 'build' def set_options(opt): autowaf.set_options(opt) - opt.tool_options('compiler_cc') def configure(conf): autowaf.configure(conf) @@ -55,7 +54,7 @@ def configure(conf): def build(bld): # C Headers - install_files('PREFIX', 'include/slv2', 'slv2/*.h') + install_files('INCLUDEDIR', 'slv2', 'slv2/*.h') # Pkgconfig file autowaf.build_pc(bld, 'SLV2', SLV2_VERSION, ['REDLAND']) @@ -84,6 +83,7 @@ def build(bld): obj.name = 'libslv2' obj.target = 'slv2' obj.vnum = SLV2_LIB_VERSION + obj.inst_dir = bld.env()['LIBDIRNAME'] autowaf.use_lib(bld, obj, 'REDLAND LV2CORE') # Utilities @@ -97,6 +97,7 @@ def build(bld): obj.includes = '.' obj.uselib_local = 'libslv2' obj.target = i + obj.inst_dir = bld.env()['BINDIRNAME'] # JACK Hosts hosts = ''' @@ -111,6 +112,7 @@ def build(bld): obj.uselib = 'JACK' obj.uselib_local = 'libslv2' obj.target = i + obj.inst_dir = bld.env()['BINDIRNAME'] # Documentation autowaf.build_dox(bld, 'SLV2', SLV2_VERSION, srcdir, blddir) -- cgit v1.2.1