aboutsummaryrefslogtreecommitdiff
path: root/libindicate
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-02-25 15:00:50 -0600
committerTed Gould <ted@canonical.com>2009-02-25 15:00:50 -0600
commit2a8dfa8854a42b932670dcefdab949e6dee41a2c (patch)
tree4e9910d10f850abc5662c1b5b0a1aa1fd35aefe2 /libindicate
parent22ccedb4270f202065ce6e51a849c38b6c7645cc (diff)
parentcf43323a0c7e114920935a64503f5d8f1bd12705 (diff)
downloadlibayatana-indicator-2a8dfa8854a42b932670dcefdab949e6dee41a2c.tar.gz
libayatana-indicator-2a8dfa8854a42b932670dcefdab949e6dee41a2c.tar.bz2
libayatana-indicator-2a8dfa8854a42b932670dcefdab949e6dee41a2c.zip
Merging in changes to put back in the GObject introspection and to have better build characteristics.
Diffstat (limited to 'libindicate')
-rw-r--r--libindicate/Makefile.am52
1 files changed, 28 insertions, 24 deletions
diff --git a/libindicate/Makefile.am b/libindicate/Makefile.am
index a086fa5..5d50352 100644
--- a/libindicate/Makefile.am
+++ b/libindicate/Makefile.am
@@ -77,28 +77,32 @@ listener-marshal.c: $(srcdir)/listener-marshal.list
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=GdkPixbuf-2.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
+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=GdkPixbuf-2.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
+
+DISTCLEANFILES = \
+ Indicate-0.1.gir \
+ Indicate-0.1.typelib