[gnome-bluetooth] applet: require the just-built GnomeBluetooth-1.0.gir
- From: Dan Winship <danw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-bluetooth] applet: require the just-built GnomeBluetooth-1.0.gir
- Date: Thu, 4 Nov 2010 19:48:43 +0000 (UTC)
commit ee2af28800ff182453641005db207fc68c309fc6
Author: Dan Winship <danw gnome org>
Date: Thu Nov 4 15:25:53 2010 -0400
applet: require the just-built GnomeBluetooth-1.0.gir
Use --include-uninstalled when building GnomeBluetoothApplet-1.0.gir
so it doesn't accidentally pull in a system GIR file.
https://bugzilla.gnome.org/show_bug.cgi?id=634019
applet/Makefile-lib.am | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/applet/Makefile-lib.am b/applet/Makefile-lib.am
index 79d3906..b339fd5 100644
--- a/applet/Makefile-lib.am
+++ b/applet/Makefile-lib.am
@@ -23,12 +23,12 @@ marshal.c: marshal.list
include $(INTROSPECTION_MAKEFILE)
INTROSPECTION_GIRS =
INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
-INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=$(top_srcdir)/lib
if HAVE_INTROSPECTION
GnomeBluetoothApplet-1.0.gir: libgnome-bluetooth-applet.la
-GnomeBluetoothApplet_1_0_gir_SCANNERFLAGS = --warn-all --symbol-prefix=bluetooth_ --identifier-prefix=Bluetooth
-GnomeBluetoothApplet_1_0_gir_INCLUDES = GObject-2.0 Gtk-3.0 DBusGLib-1.0 GModule-2.0 GnomeBluetooth-1.0
+GnomeBluetoothApplet_1_0_gir_SCANNERFLAGS = --warn-all --symbol-prefix=bluetooth_ --identifier-prefix=Bluetooth --include-uninstalled=$(top_srcdir)/lib/GnomeBluetooth-1.0.gir
+GnomeBluetoothApplet_1_0_gir_INCLUDES = GObject-2.0 Gtk-3.0 DBusGLib-1.0 GModule-2.0
GnomeBluetoothApplet_1_0_gir_PACKAGES = gobject-2.0 gtk+-3.0 dbus-glib-1 gmodule-2.0 glib-2.0
GnomeBluetoothApplet_1_0_gir_CFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/lib
GnomeBluetoothApplet_1_0_gir_LIBS = libgnome-bluetooth-applet.la
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]