[libsoup] Fix introspection build on Debian/Ubuntu
- From: Dan Winship <danw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libsoup] Fix introspection build on Debian/Ubuntu
- Date: Wed, 30 Mar 2011 12:53:55 +0000 (UTC)
commit 95a8b44d44630554c8e6db8cf340a2a2fa0d8f8f
Author: Dan Winship <danw gnome org>
Date: Thu Mar 24 13:22:34 2011 -0400
Fix introspection build on Debian/Ubuntu
Debian libtool is weird about dependencies, so specify that
SoupGNOME-2.4.gir depends libsoup-2.4.la too, even though we shouldn't
have to.
(Also use --include-uninstalled, which turned out not to be the fix
for this bug, but is correct anyway.)
https://bugzilla.gnome.org/show_bug.cgi?id=645505
libsoup/Makefile.am | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
index 308c08f..c4ec90e 100644
--- a/libsoup/Makefile.am
+++ b/libsoup/Makefile.am
@@ -245,10 +245,13 @@ gi_soup_gnome_files = $(filter-out soup-gnome.h,\
$(libsoupgnomeinclude_HEADERS) \
$(filter-out %.h, $(libsoup_gnome_2_4_la_SOURCES)))
SoupGNOME-2.4.gir: libsoup-gnome-2.4.la Soup-2.4.gir
-SoupGNOME_2_4_gir_SCANNERFLAGS = --identifier-prefix=Soup --symbol-prefix=soup --c-include "libsoup/soup-gnome.h"
-SoupGNOME_2_4_gir_INCLUDES = Soup-2.4
+SoupGNOME_2_4_gir_SCANNERFLAGS = \
+ --identifier-prefix=Soup \
+ --symbol-prefix=soup \
+ --c-include "libsoup/soup-gnome.h" \
+ --include-uninstalled=$(builddir)/Soup-2.4.gir
SoupGNOME_2_4_gir_CFLAGS = $(INCLUDES)
-SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la
+SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la libsoup-2.4.la
SoupGNOME_2_4_gir_FILES = $(addprefix $(srcdir)/,$(gi_soup_gnome_files))
SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]