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 --- .bzrignore | 8 ++++---- libdbusmenu-glib/Makefile.am | 12 ++++++------ libdbusmenu-gtk/Makefile.am | 14 +++++++------- 3 files changed, 17 insertions(+), 17 deletions(-) (limited to 'libdbusmenu-glib') diff --git a/.bzrignore b/.bzrignore index f23db72..6cb6a31 100644 --- a/.bzrignore +++ b/.bzrignore @@ -64,7 +64,7 @@ tests/test-glib-proxy-client tests/test-glib-proxy-server tests/test-glib-proxy-proxy tests/test-glib-proxy -libdbusmenu-glib/DbusmenuGlib-1.0.gir -libdbusmenu-glib/DbusmenuGlib-1.0.typelib -libdbusmenu-gtk/DbusmenuGtk-1.0.gir -libdbusmenu-gtk/DbusmenuGtk-1.0.typelib +libdbusmenu-glib/DbusmenuGlib-0.2.gir +libdbusmenu-glib/DbusmenuGlib-0.2.typelib +libdbusmenu-gtk/DbusmenuGtk-0.2.gir +libdbusmenu-gtk/DbusmenuGtk-0.2.typelib 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) diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am index e787582..d14b4d5 100644 --- a/libdbusmenu-gtk/Makefile.am +++ b/libdbusmenu-gtk/Makefile.am @@ -52,16 +52,16 @@ if HAVE_INTROSPECTION introspection_sources = $(libdbusmenu_gtkinclude_HEADERS) -DbusmenuGtk-1.0.gir: libdbusmenu-gtk.la -DbusmenuGtk_1_0_gir_INCLUDES = \ +DbusmenuGtk-0.2.gir: libdbusmenu-gtk.la +DbusmenuGtk_0_2_gir_INCLUDES = \ GObject-2.0 \ Gtk-2.0 \ - DbusmenuGlib-1.0 -DbusmenuGtk_1_0_gir_CFLAGS = $(DBUSMENUGTK_CFLAGS) -I$(top_srcdir) -DbusmenuGtk_1_0_gir_LIBS = libdbusmenu-gtk.la -DbusmenuGtk_1_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources)) + DbusmenuGlib-0.2 +DbusmenuGtk_0_2_gir_CFLAGS = $(DBUSMENUGTK_CFLAGS) -I$(top_srcdir) +DbusmenuGtk_0_2_gir_LIBS = libdbusmenu-gtk.la +DbusmenuGtk_0_2_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources)) -INTROSPECTION_GIRS += DbusmenuGtk-1.0.gir +INTROSPECTION_GIRS += DbusmenuGtk-0.2.gir girdir = $(datadir)/gir-1.0 dist_gir_DATA = $(INTROSPECTION_GIRS) -- cgit v1.2.3 From 1c3e46d6c67bf175fa2354e327488e74486294fe Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 1 Mar 2010 10:28:25 -0600 Subject: Adding in VAPI generation --- libdbusmenu-glib/Makefile.am | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'libdbusmenu-glib') diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am index dc3dbe1..1264525 100644 --- a/libdbusmenu-glib/Makefile.am +++ b/libdbusmenu-glib/Makefile.am @@ -125,3 +125,19 @@ CLEANFILES += $(dist_gir_DATA) $(typelib_DATA) endif +######################### +# VAPI Files +######################### + +if HAVE_INTROSPECTION + +vapidir = $(datadir)/vala/vapi +vapi_DATA = DbusmenuGlib-0.2.vapi + +DbusmenuGlib-0.2.vapi: DbusmenuGlib-0.2.gir + $(VALA_API_GEN) --library=DbusmenuGlib-0.2 $< + +CLEANFILES += $(vapi_DATA) + +endif + -- cgit v1.2.3 From af2f4333e3bfe2351ef6bb74c0b55687d9602922 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 2 Mar 2010 09:17:38 -0600 Subject: Building the gir files at build time instead of at dist. --- libdbusmenu-glib/Makefile.am | 2 +- libdbusmenu-gtk/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'libdbusmenu-glib') diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am index 1264525..da92d24 100644 --- a/libdbusmenu-glib/Makefile.am +++ b/libdbusmenu-glib/Makefile.am @@ -116,7 +116,7 @@ DbusmenuGlib_0_2_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources)) INTROSPECTION_GIRS += DbusmenuGlib-0.2.gir girdir = $(datadir)/gir-1.0 -dist_gir_DATA = $(INTROSPECTION_GIRS) +gir_DATA = $(INTROSPECTION_GIRS) typelibdir = $(libdir)/girepository-1.0 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am index e1b16a0..2b4b732 100644 --- a/libdbusmenu-gtk/Makefile.am +++ b/libdbusmenu-gtk/Makefile.am @@ -64,7 +64,7 @@ DbusmenuGtk_0_2_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources)) INTROSPECTION_GIRS += DbusmenuGtk-0.2.gir girdir = $(datadir)/gir-1.0 -dist_gir_DATA = $(INTROSPECTION_GIRS) +gir_DATA = $(INTROSPECTION_GIRS) typelibdir = $(libdir)/girepository-1.0 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) -- cgit v1.2.3 From 950c6bc4d8ace0463ba22555496001c9ec6a1463 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 2 Mar 2010 09:55:44 -0600 Subject: Fixing the directory path for the glib gir file and making sure we clean up the girs. --- libdbusmenu-glib/Makefile.am | 2 +- libdbusmenu-gtk/Makefile.am | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'libdbusmenu-glib') diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am index da92d24..9b303ab 100644 --- a/libdbusmenu-glib/Makefile.am +++ b/libdbusmenu-glib/Makefile.am @@ -121,7 +121,7 @@ gir_DATA = $(INTROSPECTION_GIRS) typelibdir = $(libdir)/girepository-1.0 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) -CLEANFILES += $(dist_gir_DATA) $(typelib_DATA) +CLEANFILES += $(gir_DATA) $(typelib_DATA) endif diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am index 2b4b732..6963722 100644 --- a/libdbusmenu-gtk/Makefile.am +++ b/libdbusmenu-gtk/Makefile.am @@ -45,7 +45,7 @@ pkgconfigdir = $(libdir)/pkgconfig -include $(INTROSPECTION_MAKEFILE) INTROSPECTION_GIRS = -INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --add-include-path=$(top_srcdir)/libdbusmenu-glib +INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --add-include-path=$(top_builddir)/libdbusmenu-glib INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=$(top_srcdir)/libdbusmenu-glib if HAVE_INTROSPECTION @@ -69,7 +69,7 @@ gir_DATA = $(INTROSPECTION_GIRS) typelibdir = $(libdir)/girepository-1.0 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) -CLEANFILES += $(dist_gir_DATA) $(typelib_DATA) +CLEANFILES += $(gir_DATA) $(typelib_DATA) endif -- cgit v1.2.3 From ffc0d5b49e0d12c8d1f3701951c3abfb5ee2ad8a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 2 Mar 2010 10:11:23 -0600 Subject: Pulling GIRs from the build dir --- libdbusmenu-glib/Makefile.am | 2 +- libdbusmenu-gtk/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'libdbusmenu-glib') diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am index 9b303ab..c1aff41 100644 --- a/libdbusmenu-glib/Makefile.am +++ b/libdbusmenu-glib/Makefile.am @@ -100,7 +100,7 @@ menuitem-marshal.c: $(srcdir)/menuitem-marshal.list -include $(INTROSPECTION_MAKEFILE) INTROSPECTION_GIRS = INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) -INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) +INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir) if HAVE_INTROSPECTION diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am index 6963722..9cc557c 100644 --- a/libdbusmenu-gtk/Makefile.am +++ b/libdbusmenu-gtk/Makefile.am @@ -46,7 +46,7 @@ pkgconfigdir = $(libdir)/pkgconfig -include $(INTROSPECTION_MAKEFILE) INTROSPECTION_GIRS = INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --add-include-path=$(top_builddir)/libdbusmenu-glib -INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=$(top_srcdir)/libdbusmenu-glib +INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir) --includedir=$(top_builddir)/libdbusmenu-glib if HAVE_INTROSPECTION -- cgit v1.2.3