From 0a09bca306de781117fb92b1084dfafc6c267679 Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Fri, 3 Dec 2010 17:15:12 -0500
Subject: Build fixes with the latest g-ir-scanner and vapigen

---
 docs/reference/Makefile.am    |  2 +-
 src/AppIndicator-0.1.metadata |  1 +
 src/Makefile.am               | 13 ++++++++-----
 3 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 src/AppIndicator-0.1.metadata

diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index d2ef3bb..63606f9 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -91,7 +91,7 @@ expand_content_files=
 # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src $(INDICATOR_CFLAGS)
-GTKDOC_LIBS=$(top_builddir)/src/libappindicator.la $(top_builddir)/src/libapplication.la 
+GTKDOC_LIBS=$(top_builddir)/src/libappindicator.la $(top_builddir)/src/libapplication.la  $(INDICATOR_LIBS)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.local.make
diff --git a/src/AppIndicator-0.1.metadata b/src/AppIndicator-0.1.metadata
new file mode 100644
index 0000000..e4d068e
--- /dev/null
+++ b/src/AppIndicator-0.1.metadata
@@ -0,0 +1 @@
+AppIndicator name="AppIndicator"
diff --git a/src/Makefile.am b/src/Makefile.am
index 1c4e7ae..95051dc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,9 @@
 CLEANFILES =
 DISTCLEANFILES =
 BUILT_SOURCES =
-EXTRA_DIST = appindicator-0.1.pc.in
+EXTRA_DIST = \
+	appindicator-0.1.pc.in \
+	AppIndicator-0.1.metadata
 
 include $(top_srcdir)/Makefile.am.enum
 include $(top_srcdir)/Makefile.am.marshal
@@ -156,16 +158,17 @@ EXTRA_DIST += $(DBUS_SPECS)
 INTROSPECTION_GIRS = 
 INTROSPECTION_SCANNER_ARGS = \
 	--add-include-path=$(srcdir) \
-	$(addprefix --c-include=libappindicator/, $(introspection_sources))
+	$(addprefix --c-include=src/, $(introspection_sources)) \
+	--symbol-prefix=app \
+	--identifier-prefix=App
 INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir)
 
 if HAVE_INTROSPECTION
 
 introspection_sources = \
-	$(addprefix $(srcdir)/,$(libappindicator_headers)) \
-	$(addprefix $(top_builddir)/src/, $(glib_enum_h))
+	$(addprefix $(srcdir)/,$(libappindicator_headers))
 
-AppIndicator-0.1.gir: libappindicator.la $(glib_enum_h)
+AppIndicator-0.1.gir: libappindicator.la 
 AppIndicator_0_1_gir_INCLUDES = \
     GObject-2.0 \
     Gtk-2.0
-- 
cgit v1.2.3