* New upstream release.

  * Unref the child that was created
  * Build GIR and VAPI files (LP: #510610)
  * Fixes to documentation and enum construction
  * Fix distcheck
  * Merging patch to add assembly information to Mono
    binding (LP: #547195)
* debian/control: Add GObject Introspection and Vala build
  dependencies.
* Added debian/gir1.0-libappindicator-0.1.install and modified
  debian/control and debian/libappindicator-dev.install to handle
  the VAPI and GI files.
* debian/libappindicator0.0-cil.install: Fixing directory of cli files 

1 files changed, 84 insertions, 29 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 9f2771e..787ba2f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 CLEANFILES =
 DISTCLEANFILES =
 BUILT_SOURCES =
-EXTRA_DIST = libappindicator/appindicator-0.1.pc.in
+EXTRA_DIST = appindicator-0.1.pc.in
 
 include $(top_srcdir)/Makefile.am.enum
 include $(top_srcdir)/Makefile.am.marshal
@@ -32,27 +32,32 @@ libapplication_la_LDFLAGS = -module -avoid-version
 
 libexec_PROGRAMS = indicator-application-service
 
+BUILT_SOURCES += \
+	application-service-server.h \
+	application-service-marshal.h \
+	application-service-marshal.c \
+	dbus-properties-client.h \
+	notification-item-client.h \
+	notification-watcher-server.h
+
 indicator_application_service_SOURCES = \
 	application-service.c \
 	application-service-appstore.h \
 	application-service-appstore.c \
 	application-service-lru-file.h \
 	application-service-lru-file.c \
-	application-service-marshal.h \
 	application-service-marshal.c \
-	application-service-server.h \
 	application-service-watcher.h \
 	application-service-watcher.c \
-	dbus-properties-client.h \
-	dbus-shared.h \
-	notification-item-client.h \
-	notification-watcher-server.h
+	app-indicator-enum-types.c \
+	dbus-shared.h
 indicator_application_service_CFLAGS = \
 	$(INDICATOR_CFLAGS) \
 	-Wall -Werror \
 	-DG_LOG_DOMAIN=\"indicator-application-service\"
 indicator_application_service_LDADD = \
-	$(INDICATOR_LIBS)
+	$(INDICATOR_LIBS) \
+	libappindicator.la
 
 glib_marshal_list = application-service-marshal.list
 glib_marshal_prefix = _application_service_marshal
@@ -61,24 +66,14 @@ glib_marshal_prefix = _application_service_marshal
 # Library
 ##################################
 
-pkgconfig_DATA = libappindicator/appindicator-0.1.pc
+pkgconfig_DATA = appindicator-0.1.pc
 pkgconfigdir = $(libdir)/pkgconfig
 
-glib_enum_h = libappindicator/app-indicator-enum-types.h
-glib_enum_c = libappindicator/app-indicator-enum-types.gen.c
-glib_enum_headers = $(libappindicator_headers)
-
-libappindicator/app-indicator-enum-types.c: libappindicator/app-indicator-enum-types.gen.c
-	sed -e "s|\"passive\"|\"Passive\"|" \
-	    -e "s|\"active\"|\"Active\"|" \
-	    -e "s|\"attention\"|\"NeedsAttention\"|" \
-	    -e "s|\"application-status\"|\"ApplicationStatus\"|" \
-	    -e "s|\"communications\"|\"Communications\"|" \
-	    -e "s|\"system-services\"|\"SystemServices\"|" \
-	    -e "s|\"hardware\"|\"Hardware\"|" \
-	    -e "s|\"other\"|\"Other\"|" \
-	       $< > $@
-DISTCLEANFILES += libappindicator/app-indicator-enum-types.c
+glib_enum_h = app-indicator-enum-types.h
+glib_enum_c = app-indicator-enum-types.c
+glib_enum_headers = $(addprefix $(srcdir)/, $(libappindicator_headers))
+
+DISTCLEANFILES += app-indicator-enum-types.c
 
 lib_LTLIBRARIES = \
 	libappindicator.la
@@ -86,18 +81,20 @@ lib_LTLIBRARIES = \
 libappindicatorincludedir=$(includedir)/libappindicator-0.1/libappindicator
 
 libappindicator_headers = \
-	$(srcdir)/libappindicator/app-indicator.h
+	app-indicator.h
 
 libappindicatorinclude_HEADERS = \
 	$(libappindicator_headers) \
 	$(glib_enum_h)
 
+BUILT_SOURCES += \
+	notification-watcher-client.h \
+	notification-item-server.h
+
 libappindicator_la_SOURCES = \
 	$(libappindicator_headers) \
-	libappindicator/app-indicator-enum-types.c \
-	notification-watcher-client.h \
-	notification-item-server.h \
-	libappindicator/app-indicator.c
+	app-indicator-enum-types.c \
+	app-indicator.c
 
 libappindicator_la_LDFLAGS = \
 	-version-info 0:0:0 \
@@ -117,6 +114,7 @@ libappindicator_la_LIBADD = \
 ##################################
 
 DBUS_SPECS = \
+	dbus-properties.xml \
 	application-service.xml \
 	notification-item.xml \
 	notification-watcher.xml
@@ -142,3 +140,60 @@ BUILT_SOURCES += \
 CLEANFILES += $(BUILT_SOURCES)
 
 EXTRA_DIST += $(DBUS_SPECS)
+
+#########################
+# GObject Introsepction 
+#########################
+
+-include $(INTROSPECTION_MAKEFILE)
+INTROSPECTION_GIRS = 
+INTROSPECTION_SCANNER_ARGS = \
+	--add-include-path=$(srcdir) \
+	$(addprefix --c-include=libappindicator/, $(introspection_sources))
+INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir)
+
+if HAVE_INTROSPECTION
+
+introspection_sources = \
+	$(addprefix $(srcdir)/,$(libappindicator_headers)) \
+	$(addprefix $(top_builddir)/src/, $(glib_enum_h))
+
+AppIndicator-0.1.gir: libappindicator.la $(glib_enum_h)
+AppIndicator_0_1_gir_INCLUDES = \
+    GObject-2.0 \
+    Gtk-2.0
+AppIndicator_0_1_gir_CFLAGS = $(INDICATOR_CFLAGS) -I$(srcdir) -I$(top_builddir)/src
+AppIndicator_0_1_gir_LIBS = libappindicator.la
+AppIndicator_0_1_gir_FILES = $(introspection_sources)
+
+INTROSPECTION_GIRS += AppIndicator-0.1.gir
+
+girdir = $(datadir)/gir-1.0
+gir_DATA = $(INTROSPECTION_GIRS)
+
+typelibdir = $(libdir)/girepository-1.0
+typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+
+CLEANFILES += $(gir_DATA) $(typelib_DATA)
+
+endif
+
+#########################
+# VAPI Files
+#########################
+
+if HAVE_INTROSPECTION
+
+vapidir = $(datadir)/vala/vapi
+vapi_DATA = AppIndicator-0.1.vapi
+
+AppIndicator-0.1.vapi: AppIndicator-0.1.gir Makefile.am
+	$(VALA_API_GEN) --library=AppIndicator-0.1 \
+		--pkg gtk+-2.0 \
+		--vapidir=$(top_builddir)/src \
+		$<
+
+CLEANFILES += $(vapi_DATA)
+
+endif
+