From 00cc2d7a9dcd132e0a58daf84eb0008102dbd691 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 26 Feb 2010 12:10:12 -0600 Subject: First pass at building GIR. Still errors --- libdbusmenu-glib/Makefile.am | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'libdbusmenu-glib') diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am index 65ebf4c..ed523da 100644 --- a/libdbusmenu-glib/Makefile.am +++ b/libdbusmenu-glib/Makefile.am @@ -1,4 +1,6 @@ +CLEANFILES = + EXTRA_DIST = \ dbusmenu-glib.pc.in \ dbus-menu.xml \ @@ -91,3 +93,35 @@ menuitem-marshal.c: $(srcdir)/menuitem-marshal.list --prefix=_dbusmenu_menuitem_marshal $(srcdir)/menuitem-marshal.list \ > menuitem-marshal.c +######################### +# GObject Introsepction +######################### + +-include $(INTROSPECTION_MAKEFILE) +INTROSPECTION_GIRS = +INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) +INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) + +if HAVE_INTROSPECTION + +introspection_sources = $(libdbusmenu_glib_la_SOURCES) + +DbusmenuGlib-1.0.gir: libdbusmenu-glib.la +DbusmenuGlib_1_0_gir_INCLUDES = \ + GObject-2.0 +DbusmenuGlib_1_0_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS) +DbusmenuGlib_1_0_gir_LIBS = libdbusmenu-glib.la +DbusmenuGlib_1_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources)) + +INTROSPECTION_GIRS += DbusmenuGlib-1.0.gir + +girdir = $(datadir)/gir-1.0 +dist_gir_DATA = $(INTROSPECTION_GIRS) + +typelibdir = $(libdir)/girepository-1.0 +typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) + +CLEANFILES += $(dist_gir_DATA) $(typelib_DATA) + +endif + -- cgit v1.2.3 From fa8ad4d6cda123c9247e8c8fc1c44e317a563626 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 26 Feb 2010 17:40:53 -0600 Subject: Only intropsecting the headers instead of all the files. --- libdbusmenu-glib/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libdbusmenu-glib') diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am index ed523da..c1c213b 100644 --- a/libdbusmenu-glib/Makefile.am +++ b/libdbusmenu-glib/Makefile.am @@ -104,7 +104,7 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) if HAVE_INTROSPECTION -introspection_sources = $(libdbusmenu_glib_la_SOURCES) +introspection_sources = $(libdbusmenu_glibinclude_HEADERS) DbusmenuGlib-1.0.gir: libdbusmenu-glib.la DbusmenuGlib_1_0_gir_INCLUDES = \ -- cgit v1.2.3 From e011a35e634aeb0a35c95e2c5b982062845262f1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 28 Feb 2010 13:54:03 -0600 Subject: Change version number to 0.2 --- libdbusmenu-glib/Makefile.am | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libdbusmenu-glib') diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am index c1c213b..dc3dbe1 100644 --- a/libdbusmenu-glib/Makefile.am +++ b/libdbusmenu-glib/Makefile.am @@ -106,14 +106,14 @@ if HAVE_INTROSPECTION introspection_sources = $(libdbusmenu_glibinclude_HEADERS) -DbusmenuGlib-1.0.gir: libdbusmenu-glib.la -DbusmenuGlib_1_0_gir_INCLUDES = \ +DbusmenuGlib-0.2.gir: libdbusmenu-glib.la +DbusmenuGlib_0_2_gir_INCLUDES = \ GObject-2.0 -DbusmenuGlib_1_0_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS) -DbusmenuGlib_1_0_gir_LIBS = libdbusmenu-glib.la -DbusmenuGlib_1_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources)) +DbusmenuGlib_0_2_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS) +DbusmenuGlib_0_2_gir_LIBS = libdbusmenu-glib.la +DbusmenuGlib_0_2_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources)) -INTROSPECTION_GIRS += DbusmenuGlib-1.0.gir +INTROSPECTION_GIRS += DbusmenuGlib-0.2.gir girdir = $(datadir)/gir-1.0 dist_gir_DATA = $(INTROSPECTION_GIRS) -- cgit v1.2.3