diff options
| author | Ted Gould <ted@canonical.com> | 2009-02-25 15:00:50 -0600 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-02-25 15:00:50 -0600 |
| commit | 2a8dfa8854a42b932670dcefdab949e6dee41a2c (patch) | |
| tree | 4e9910d10f850abc5662c1b5b0a1aa1fd35aefe2 | |
| parent | 22ccedb4270f202065ce6e51a849c38b6c7645cc (diff) | |
| parent | cf43323a0c7e114920935a64503f5d8f1bd12705 (diff) | |
| download | libayatana-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.
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | libindicate/Makefile.am | 52 |
2 files changed, 30 insertions, 25 deletions
diff --git a/Makefile.am b/Makefile.am index 45a2bdb..f304ab6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,4 +15,5 @@ EXTRA_DIST = \ xmldocs.make DISTCLEANFILES = \ - indicator-applet-*.tar.gz + indicator-applet-*.tar.gz \ + gtk-doc.make 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 |