[gnome-bluetooth] applet: Fix includedirs used for introspection
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-bluetooth] applet: Fix includedirs used for introspection
- Date: Thu, 11 Nov 2010 20:49:25 +0000 (UTC)
commit d92b5b11417992ae91ad593fe9dae3c9759ef55c
Author: Bastien Nocera <hadess hadess net>
Date: Thu Nov 11 20:45:09 2010 +0000
applet: Fix includedirs used for introspection
As well as the applet library itself.
applet/Makefile-lib.am | 4 ++--
applet/bluetooth-applet.c | 8 ++++----
applet/bluetooth-applet.h | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/applet/Makefile-lib.am b/applet/Makefile-lib.am
index ea3c30f..7f8a43e 100644
--- a/applet/Makefile-lib.am
+++ b/applet/Makefile-lib.am
@@ -26,11 +26,11 @@ EXTRA_DIST += marshal.list
include $(INTROSPECTION_MAKEFILE)
INTROSPECTION_GIRS =
INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
-INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=$(top_srcdir)/lib
+INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=$(top_builddir)/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 --include-uninstalled=$(top_srcdir)/lib/GnomeBluetooth-1.0.gir
+GnomeBluetoothApplet_1_0_gir_SCANNERFLAGS = --warn-all --symbol-prefix=bluetooth_ --identifier-prefix=Bluetooth --include-uninstalled=$(top_builddir)/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
diff --git a/applet/bluetooth-applet.c b/applet/bluetooth-applet.c
index faf140c..1b5968a 100644
--- a/applet/bluetooth-applet.c
+++ b/applet/bluetooth-applet.c
@@ -27,10 +27,10 @@
#include <gio/gio.h>
#include <bluetooth-applet.h>
-#include <lib/bluetooth-client.h>
-#include <lib/bluetooth-client-private.h>
-#include <lib/bluetooth-killswitch.h>
-#include <lib/bluetooth-agent.h>
+#include <bluetooth-client.h>
+#include <bluetooth-client-private.h>
+#include <bluetooth-killswitch.h>
+#include <bluetooth-agent.h>
#include <marshal.h>
diff --git a/applet/bluetooth-applet.h b/applet/bluetooth-applet.h
index de21aa9..26e8973 100644
--- a/applet/bluetooth-applet.h
+++ b/applet/bluetooth-applet.h
@@ -28,7 +28,7 @@
#include <glib.h>
#include <glib-object.h>
#include <gio/gio.h>
-#include <lib/bluetooth-enums.h>
+#include <bluetooth-enums.h>
/**
* BluetoothCapabilities:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]