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 | add7dd9f6b1bc17519d7c64282a7f2295735951c (patch) | |
| tree | 8d11bb0aa787fa563ca18471c795ca90d8429a1d /src | |
| parent | bd6f6beb3137bb637aced8b68873513b4c7dc769 (diff) | |
| download | lilv-add7dd9f6b1bc17519d7c64282a7f2295735951c.tar.gz lilv-add7dd9f6b1bc17519d7c64282a7f2295735951c.tar.bz2 lilv-add7dd9f6b1bc17519d7c64282a7f2295735951c.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/slv2@650 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 3 | ||||
| -rw-r--r-- | src/plugin.c | 7 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 43543b5..a85a1af 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,4 @@ -AM_CFLAGS = -std=c99 -I$(top_srcdir)/include -I$(top_srcdir) @REDLAND_CFLAGS@ -DLIBSLV2_SOURCE -AM_LDFLAGS = `pkg-config --libs rasqal` +AM_CFLAGS = -std=c99 @SLV2_CFLAGS@ @REDLAND_CFLAGS@ -DLIBSLV2_SOURCE lib_LTLIBRARIES = libslv2.la libslv2_la_LIBADD = @REDLAND_LIBS@ diff --git a/src/plugin.c b/src/plugin.c index 7802fdd..fa7ebe6 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -611,9 +611,10 @@ slv2_plugin_get_gui_library_uri(SLV2Plugin plugin, const char* slv2_gui_type_get_uri(SLV2GUIType type) { - // Only one for now... - assert(type == SLV2_GUI_TYPE_GTK2); - return "http://ll-plugins.nongnu.org/lv2/ext/gtk2gui"; + if (type == SLV2_GUI_TYPE_GTK2) + return "http://ll-plugins.nongnu.org/lv2/ext/gtk2gui"; + else + return NULL; } |