aboutsummaryrefslogtreecommitdiff
path: root/libindicate
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-01-16 16:34:04 -0600
committerTed Gould <ted@canonical.com>2009-01-16 16:34:04 -0600
commitba631e9419ab5ca3fe2971d50804649e4b23c3d5 (patch)
tree4384843fdc9b0a06687b26144c82cfd6632d79ae /libindicate
parent09d01e604a2ab80a9a9c5d59a30021993adbf93b (diff)
parente3f1f4e35e606e7bcb01da73bfdf70720b9739f3 (diff)
downloadlibayatana-indicator-ba631e9419ab5ca3fe2971d50804649e4b23c3d5.tar.gz
libayatana-indicator-ba631e9419ab5ca3fe2971d50804649e4b23c3d5.tar.bz2
libayatana-indicator-ba631e9419ab5ca3fe2971d50804649e4b23c3d5.zip
Adding the GObject Introspection files into the build and the
packaging.
Diffstat (limited to 'libindicate')
-rw-r--r--libindicate/Makefile.am35
-rw-r--r--libindicate/gir.sh2
2 files changed, 31 insertions, 6 deletions
diff --git a/libindicate/Makefile.am b/libindicate/Makefile.am
index d2a0811..53cb273 100644
--- a/libindicate/Makefile.am
+++ b/libindicate/Makefile.am
@@ -46,28 +46,55 @@ libindicate_la_LIBADD = \
$(LIBINDICATE_LIBS)
dbus-indicate-server.h: indicate-interface.xml
- libtool --mode=execute dbus-binding-tool \
+ dbus-binding-tool \
--prefix=indicate_server \
--mode=glib-server \
--output=dbus-indicate-server.h \
$(srcdir)/indicate-interface.xml
dbus-indicate-client.h: indicate-interface.xml
- libtool --mode=execute dbus-binding-tool \
+ dbus-binding-tool \
--prefix=indicate_client \
--mode=glib-client \
--output=dbus-indicate-client.h \
$(srcdir)/indicate-interface.xml
listener-marshal.h: listener-marshal.list
- libtool --mode=execute glib-genmarshal --header \
+ glib-genmarshal --header \
--prefix=indicate_listener_marshal $(srcdir)/listener-marshal.list \
> listener-marshal.h
listener-marshal.c: listener-marshal.list
- libtool --mode=execute glib-genmarshal --body \
+ glib-genmarshal --body \
--prefix=indicate_listener_marshal $(srcdir)/listener-marshal.list \
> listener-marshal.c
pkgconfig_DATA = indicate.pc
pkgconfigdir = $(libdir)/pkgconfig
+
+gobjectintrospection_gir_DATA = \
+ Indicate-0.1.gir
+gobjectintrospection_girdir = $(datadir)/gir
+
+gobjectintrospection_type_DATA = \
+ Indicate-0.1.typelib
+gobjectintrospection_typedir = $(libdir)/girepository
+
+irscanner_headers = $(patsubst %,$(srcdir)/%,$(indicate_headers))
+Indicate-0.1.gir: $(irscanner_headers)
+ $(G_IR_SCANNER) \
+ -v --namespace Indicate \
+ --nsversion=0.1 \
+ --add-include-path=$(srcdir) \
+ --include=GObject-2.0 \
+ --include=GLib-2.0 \
+ --include=DBus-1.0 \
+ --include=DBusGLib-1.0 \
+ --library=indicate --pkg indicate \
+ --output Indicate-0.1.gir $(irscanner_headers)
+
+Indicate-0.1.typelib: Indicate-0.1.gir
+ $(G_IR_COMPILER) \
+ --includedir=$(srcdir) Indicate-0.1.gir \
+ -o Indicate-0.1.typelib
+
diff --git a/libindicate/gir.sh b/libindicate/gir.sh
deleted file mode 100644
index e6cdd63..0000000
--- a/libindicate/gir.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-g-ir-scanner -v --namespace Indicate --nsversion=0.1 --add-include-path=. --include=GObject-2.0 --include=GLib-2.0 --library=indicate --pkg indicate --output Indicate-0.1.gir indicator.h server.h
-g-ir-compiler --includedir=. Indicate-0.1.gir -o Indicate-0.1.typelib