diff options
| author | Dan Winship <danw@gnome.org> | 2011-03-24 13:22:34 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2011-03-25 15:11:13 -0400 |
| commit | 95a8b44d44630554c8e6db8cf340a2a2fa0d8f8f (patch) | |
| tree | 75941cd0fe42776163742620ff7ca3e2cfc9f6e5 | |
| parent | 4b0d877516a08b90ae0432737160cd924e38786d (diff) | |
| download | libsoup-95a8b44d44630554c8e6db8cf340a2a2fa0d8f8f.tar.gz | |
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
| -rw-r--r-- | libsoup/Makefile.am | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am index 308c08fe..c4ec90e1 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 |