From 556a787f197e63fbe6457e16e19545e24b455fab Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 28 Feb 2010 13:41:22 -0600 Subject: Generating the introspection data --- libdbusmenu-gtk/Makefile.am | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) (limited to 'libdbusmenu-gtk') diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am index 97d8563..e787582 100644 --- a/libdbusmenu-gtk/Makefile.am +++ b/libdbusmenu-gtk/Makefile.am @@ -1,4 +1,6 @@ +CLEANFILES = + EXTRA_DIST = \ dbusmenu-gtk.pc.in @@ -28,7 +30,7 @@ libdbusmenu_gtk_la_LDFLAGS = \ -export-symbols-regex "^[^_].*" libdbusmenu_gtk_la_CFLAGS = \ - $(DBUSMENUGTK_CFLAGS) -I$(srcdir)/.. -Wall -Werror -DG_DISABLE_DEPRECATED -DG_LOG_DOMAIN="\"LIBDBUSMENU-GTK\"" + $(DBUSMENUGTK_CFLAGS) -I$(top_srcdir) -Wall -Werror -DG_DISABLE_DEPRECATED -DG_LOG_DOMAIN="\"LIBDBUSMENU-GTK\"" libdbusmenu_gtk_la_LIBADD = \ ../libdbusmenu-glib/libdbusmenu-glib.la \ @@ -37,3 +39,36 @@ libdbusmenu_gtk_la_LIBADD = \ pkgconfig_DATA = dbusmenu-gtk.pc pkgconfigdir = $(libdir)/pkgconfig +######################### +# GObject Introsepction +######################### + +-include $(INTROSPECTION_MAKEFILE) +INTROSPECTION_GIRS = +INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --add-include-path=$(top_srcdir)/libdbusmenu-glib +INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=$(top_srcdir)/libdbusmenu-glib + +if HAVE_INTROSPECTION + +introspection_sources = $(libdbusmenu_gtkinclude_HEADERS) + +DbusmenuGtk-1.0.gir: libdbusmenu-gtk.la +DbusmenuGtk_1_0_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)) + +INTROSPECTION_GIRS += DbusmenuGtk-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 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-gtk/Makefile.am | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'libdbusmenu-gtk') 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 23736426a5804d2d17825c01dc661dd4dbb66dc3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 1 Mar 2010 10:35:21 -0600 Subject: Generating the VAPI files --- libdbusmenu-gtk/Makefile.am | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'libdbusmenu-gtk') diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am index d14b4d5..b18d33c 100644 --- a/libdbusmenu-gtk/Makefile.am +++ b/libdbusmenu-gtk/Makefile.am @@ -72,3 +72,32 @@ typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) CLEANFILES += $(dist_gir_DATA) $(typelib_DATA) endif + +######################### +# VAPI Files +######################### + +if HAVE_INTROSPECTION + +vapidir = $(datadir)/vala/vapi +vapi_DATA = DbusmenuGtk-0.2.vapi + +DbusmenuGtk-0.2.vapi: DbusmenuGtk-0.2.tmp.gir Makefile.am + $(VALA_API_GEN) --library=DbusmenuGtk-0.2 \ + --pkg gdk-pixbuf-2.0 \ + --pkg gtk+-2.0 \ + --pkg atk \ + --pkg DbusmenuGlib-0.2 \ + --vapidir=$(top_builddir)/libdbusmenu-glib \ + $< + +DbusmenuGtk-0.2.tmp.gir: DbusmenuGtk-0.2.gir + $(SED) \ + -e "s|GdkPixbuf.Pixbuf|Gdk.Pixbuf|g" \ + -e "s|Atk.ImplementorIface|Atk.Implementor|g" \ + $< > $@ + +CLEANFILES += $(vapi_DATA) + +endif + -- cgit v1.2.3 From 9e56feb947b96367299207cc1eef3761d96e0287 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 1 Mar 2010 10:39:38 -0600 Subject: Adding the temp file to the clean stuff --- libdbusmenu-gtk/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libdbusmenu-gtk') diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am index b18d33c..e1b16a0 100644 --- a/libdbusmenu-gtk/Makefile.am +++ b/libdbusmenu-gtk/Makefile.am @@ -97,7 +97,7 @@ DbusmenuGtk-0.2.tmp.gir: DbusmenuGtk-0.2.gir -e "s|Atk.ImplementorIface|Atk.Implementor|g" \ $< > $@ -CLEANFILES += $(vapi_DATA) +CLEANFILES += $(vapi_DATA) DbusmenuGtk-0.2.tmp.gir endif -- cgit v1.2.3