summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2008-10-03 01:10:58 +0000
committerDavid Robillard <d@drobilla.net>2008-10-03 01:10:58 +0000
commitd8e1831406ab0da10025e3fa203d9d0ae5c31368 (patch)
tree394ccf6be45af08ecfeb9c03efc77e2eb4322ea2
parentbbbf37272e07b47f7b69c3eb93ce4b7c4531b7cc (diff)
downloadlilv-d8e1831406ab0da10025e3fa203d9d0ae5c31368.tar.gz
lilv-d8e1831406ab0da10025e3fa203d9d0ae5c31368.tar.bz2
lilv-d8e1831406ab0da10025e3fa203d9d0ae5c31368.zip
Support building locally against header-only libraries in autowaf.
Remove CONFIG_H_PATH define and replace with just "config.h" (define messed up dependency tracking). git-svn-id: http://svn.drobilla.net/lad/trunk/slv2@1600 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--hosts/lv2_jack_host.c2
-rw-r--r--src/world.c2
-rw-r--r--utils/lv2_inspect.c2
-rw-r--r--utils/lv2_list.c2
-rw-r--r--wscript3
5 files changed, 5 insertions, 6 deletions
diff --git a/hosts/lv2_jack_host.c b/hosts/lv2_jack_host.c
index 08ae29d..4703ac8 100644
--- a/hosts/lv2_jack_host.c
+++ b/hosts/lv2_jack_host.c
@@ -16,7 +16,7 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include CONFIG_H_PATH
+#include "config.h"
#define _XOPEN_SOURCE 500
#include <stdio.h>
diff --git a/src/world.c b/src/world.c
index 41981df..357839d 100644
--- a/src/world.c
+++ b/src/world.c
@@ -16,7 +16,7 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include CONFIG_H_PATH
+#include "config.h"
#define _XOPEN_SOURCE 500
#include <string.h>
diff --git a/utils/lv2_inspect.c b/utils/lv2_inspect.c
index 901cf96..2347b68 100644
--- a/utils/lv2_inspect.c
+++ b/utils/lv2_inspect.c
@@ -16,7 +16,7 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include CONFIG_H_PATH
+#include "config.h"
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
diff --git a/utils/lv2_list.c b/utils/lv2_list.c
index 18aa911..dc9614f 100644
--- a/utils/lv2_list.c
+++ b/utils/lv2_list.c
@@ -16,7 +16,7 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include CONFIG_H_PATH
+#include "config.h"
#include <stdio.h>
#include <string.h>
#include <slv2/slv2.h>
diff --git a/wscript b/wscript
index ccc74df..403c2b0 100644
--- a/wscript
+++ b/wscript
@@ -46,8 +46,7 @@ def configure(conf):
autowaf.check_pkg(conf, 'jack', destvar='JACK', vnum='0.107.0', mandatory=False)
conf.env.append_value('CCFLAGS', '-std=c99')
conf.define('SLV2_VERSION', SLV2_VERSION)
- conf.write_config_header('waf-config.h')
- conf.env.append_value('CCFLAGS', '-DCONFIG_H_PATH=\\\"waf-config.h\\\"')
+ conf.write_config_header('config.h')
autowaf.print_summary(conf)
autowaf.display_header('SLV2 Configuration')