Fork libayatana-indicator from Ubuntu's libindicator shared library.

57 files changed, 1272 insertions, 158 deletions

diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf
deleted file mode 100644
index 6c96a98..0000000
--- a/.bzr-builddeb/default.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[BUILDDEB]
-split = True
diff --git a/Makefile.am b/Makefile.am
index 6a72e0b..24d3cd8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,22 +1,23 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 SUBDIRS = \
-	libindicator \
+	libayatana-indicator \
 	tools
 
-tools: libindicator
+tools: libayatana-indicator
 
 if WANT_TESTS
 SUBDIRS += \
 	tests
 
-tests: libindicator
+tests: libayatana-indicator
 endif
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-deprecations
 
 DISTCLEANFILES = \
-	libindicator-*.tar.gz
+	libayatana-indicator-*.tar.gz
+
 
 dist-hook:
 	@if test -d "$(top_srcdir)/.bzr"; \
diff --git a/README b/README
index b51e110..d65cc41 100644
--- a/README
+++ b/README
@@ -12,7 +12,7 @@ example:
 
   [Indicator Service]
   Name=indicator-example
-  ObjectPath=/com/canonical/indicator/example
+  ObjectPath=/org/ayatana/indicator/example
 
 It should also contain a hint to where the indicator should appear in the panel:
 
@@ -27,13 +27,13 @@ of those profiles, containing the object path on which the menu is
 exported:
 
   [desktop]
-  ObjectPath=/com/canonical/indicator/example/desktop
+  ObjectPath=/org/ayatana/indicator/example/desktop
 
   [greeter]
-  ObjectPath=/com/canonical/indicator/example/desktop
+  ObjectPath=/org/ayatana/indicator/example/desktop
 
   [phone]
-  ObjectPath=/com/canonical/indicator/example/phone
+  ObjectPath=/org/ayatana/indicator/example/phone
 
 Object paths can be reused for different profiles (the greeter uses the
 same menu as the desktop in the above example).
diff --git a/configure.ac b/configure.ac
index 7c81575..d02b182 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
-AC_INIT([libindicator],
-        [12.10.2],
-        [http://bugs.launchpad.net/libindicator],
-        [libindicator],
-        [http://launchpad.net/libindicator])
+AC_INIT([libayatana-indicator],
+        [0.6.0],
+        [https://github.com/ArcticaProject/libayatana-indicator/issues],
+        [libayatana-indicator],
+        [https://github.com/ArcticaProject/libayatana-indicator])
 
 AC_PREREQ([2.64])
 
@@ -20,6 +20,7 @@ AM_SILENT_RULES([yes])]
 # Check for programs
 AC_PROG_CC
 AM_PROG_CC_C_O
+AM_PROG_AR
 
 # Initialize libtool
 LT_PREREQ([2.2])
@@ -45,7 +46,7 @@ AS_IF([test "x$enable_deprecations" = xno],
 GTK_REQUIRED_VERSION=2.18
 GTK3_REQUIRED_VERSION=3.6
 GIO_UNIX_REQUIRED_VERSION=2.37
-IDO_REQUIRED_VERSION=13.10.0
+IDO_REQUIRED_VERSION=0.4.0
 
 AC_ARG_WITH([gtk],
   [AS_HELP_STRING([--with-gtk],
@@ -56,7 +57,7 @@ AS_IF([test "x$with_gtk" = x3],
         [PKG_CHECK_MODULES(LIBINDICATOR,  gtk+-3.0 >= $GTK3_REQUIRED_VERSION
                                           gmodule-2.0
                                           gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
-                                          libido3-0.1 >= $IDO_REQUIRED_VERSION)
+                                          libayatana-ido3-0.4 >= $IDO_REQUIRED_VERSION)
         ],
       [test "x$with_gtk" = x2],
         [PKG_CHECK_MODULES(LIBINDICATOR,  gtk+-2.0 >= $GTK_REQUIRED_VERSION
@@ -152,9 +153,9 @@ AC_SUBST(COVERAGE_LDFLAGS)
 
 AC_CONFIG_FILES([
 Makefile
-libindicator/Makefile
-libindicator/indicator-0.4.pc.in
-libindicator/indicator3-0.4.pc.in
+libayatana-indicator/Makefile
+libayatana-indicator/ayatana-indicator-0.4.pc.in
+libayatana-indicator/ayatana-indicator3-0.4.pc.in
 tests/Makefile
 tools/Makefile
 ])
diff --git a/debian/changelog b/debian/changelog
index 9d648e5..4aba221 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libayatana-indicator (0.6.0) UNRELEASED; urgency=medium
+
+  * Fork from Ubuntu's libindicator.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Fri, 06 Nov 2015 12:15:48 +0100
+
 libindicator (12.10.2+14.10.20140922-0ubuntu1) utopic; urgency=low
 
   [ Marco Trevisan (Treviño) ]
diff --git a/debian/control b/debian/control
index 3fc4d64..5145d58 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,7 @@
-Source: libindicator
+Source: libayatana-indicator
 Section: libs
 Priority: optional
-Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: The Ayatana Packagers <pkg-ayatana-devel@lists.alioth.debian.org>
-Uploaders: Evgeni Golov <evgeni@debian.org>, Kartik Mistry <kartik@debian.org>
+Maintainer: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                libtool,
@@ -15,16 +13,13 @@ Build-Depends: debhelper (>= 9),
                libglib2.0-dev (>= 2.37),
                libgtk2.0-dev (>= 2.18),
                libgtk-3-dev (>= 2.91.3),
-               libido3-0.1-dev (>= 13.10.0)
-Standards-Version: 3.9.2
-Homepage: https://launchpad.net/libindicator
-# If you aren't a member of ~indicator-applet-developers but need to upload
-# packaging changes, just go ahead.  ~indicator-applet-developers will notice
-# and sync up the code again.
-Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/libindicator/trunk.13.04
-Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-developers/libindicator/trunk.13.04/files
+               libayatana-ido3-0.4-dev (>= 0.4.0)
+Standards-Version: 3.9.6
+Homepage: https://github.com/ArcticaProject/libayatana-indicator
+Vcs-Git: git://cgit.arctica-project.org/ayatana/libayatana-indicator.git
+Vcs-Browser: https://cgit.arctica-project.org/ayatana/libayatana-indicator.git/
 
-Package: libindicator7
+Package: libayatana-indicator7
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -35,20 +30,20 @@ Description: panel indicator applet - shared library
  .
  This package contains the library itself.
 
-Package: libindicator-dev
+Package: libayatana-indicator-dev
 Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libgtk2.0-dev (>= 2.12.0),
-         libindicator7 (= ${binary:Version}),
+         libayatana-indicator7 (= ${binary:Version}),
 Description: panel indicator applet - library development files
  This library contains information to build indicators to go into
  the indicator applet.
  .
  This package contains files that are needed to build applications.
 
-Package: libindicator3-7
+Package: libayatana-indicator3-7
 Section: libs
 Architecture: any
 Pre-Depends: multiarch-support
@@ -60,29 +55,29 @@ Description: panel indicator applet - shared library
  .
  This package contains the library itself.
 
-Package: libindicator3-dev
+Package: libayatana-indicator3-dev
 Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libgtk-3-dev (>= 2.91.3),
-         libindicator3-7 (= ${binary:Version}),
-         libindicator-dev (= ${binary:Version}),
+         libayatana-indicator3-7 (= ${binary:Version}),
+         libayatana-indicator-dev (= ${binary:Version}),
 Description: panel indicator applet - library development files
  This library contains information to build indicators to go into
  the indicator applet.
  .
  This package contains files that are needed to build applications.
 
-Package: libindicator3-tools
+Package: libayatana-indicator3-tools
 Section: devel
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libindicator3-7 (= ${binary:Version}),
-Replaces: libindicator-tools,
-Conflicts: libindicator-tools,
-Description: Tools for libindicator
+         libayatana-indicator3-7 (= ${binary:Version}),
+Replaces: libayatana-indicator-tools,
+Conflicts: libayatana-indicator-tools,
+Description: Tools for libayatana-indicator
  Tools useful for developers of applications using indicators.
  .
  This package contains files that are needed to build applications.
diff --git a/debian/libayatana-indicator-dev.install b/debian/libayatana-indicator-dev.install
new file mode 100644
index 0000000..ff4f500
--- /dev/null
+++ b/debian/libayatana-indicator-dev.install
@@ -0,0 +1,4 @@
+usr/include /usr/
+usr/lib/*/pkgconfig/ayatana-indicator-0.4.pc
+usr/lib/*/libayatana-indicator.a
+usr/lib/*/libayatana-indicator.so
diff --git a/debian/libayatana-indicator3-7.install b/debian/libayatana-indicator3-7.install
new file mode 100644
index 0000000..e34ff32
--- /dev/null
+++ b/debian/libayatana-indicator3-7.install
@@ -0,0 +1 @@
+usr/lib/*/libayatana-indicator3.so.*
diff --git a/debian/libayatana-indicator3-dev.install b/debian/libayatana-indicator3-dev.install
new file mode 100644
index 0000000..56df11c
--- /dev/null
+++ b/debian/libayatana-indicator3-dev.install
@@ -0,0 +1,4 @@
+usr/include /usr/
+usr/lib/*/pkgconfig/ayatana-indicator3-0.4.pc
+usr/lib/*/libayatana-indicator3.a
+usr/lib/*/libayatana-indicator3.so
diff --git a/debian/libayatana-indicator3-tools.install b/debian/libayatana-indicator3-tools.install
new file mode 100644
index 0000000..dadee01
--- /dev/null
+++ b/debian/libayatana-indicator3-tools.install
@@ -0,0 +1,2 @@
+usr/lib/*/ayatana-indicator-loader3
+usr/share/libayatana-indicator/80indicator-debugging /usr/share/libayatana-indicator/
diff --git a/debian/libayatana-indicator7.install b/debian/libayatana-indicator7.install
new file mode 100644
index 0000000..f84cb23
--- /dev/null
+++ b/debian/libayatana-indicator7.install
@@ -0,0 +1 @@
+usr/lib/*/libayatana-indicator.so.*
diff --git a/debian/libindicator-dev.install b/debian/libindicator-dev.install
deleted file mode 100644
index fb02937..0000000
--- a/debian/libindicator-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include /usr/
-usr/lib/*/pkgconfig/indicator-0.4.pc
-usr/lib/*/libindicator.a
-usr/lib/*/libindicator.so
diff --git a/debian/libindicator3-7.install b/debian/libindicator3-7.install
deleted file mode 100644
index a4694a6..0000000
--- a/debian/libindicator3-7.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libindicator3.so.*
diff --git a/debian/libindicator3-dev.install b/debian/libindicator3-dev.install
deleted file mode 100644
index 866f3eb..0000000
--- a/debian/libindicator3-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include /usr/
-usr/lib/*/pkgconfig/indicator3-0.4.pc
-usr/lib/*/libindicator3.a
-usr/lib/*/libindicator3.so
diff --git a/debian/libindicator3-tools.install b/debian/libindicator3-tools.install
deleted file mode 100644
index a58fa0b..0000000
--- a/debian/libindicator3-tools.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/indicator-loader3
-usr/share/libindicator/80indicator-debugging /usr/share/libindicator/
diff --git a/debian/libindicator7.install b/debian/libindicator7.install
deleted file mode 100644
index 473cb9d..0000000
--- a/debian/libindicator7.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libindicator.so.*
diff --git a/debian/source/options b/debian/source/options
deleted file mode 100644
index 7423a2d..0000000
--- a/debian/source/options
+++ /dev/null
@@ -1 +0,0 @@
-single-debian-patch
diff --git a/debian/watch b/debian/watch
deleted file mode 100644
index 16f79e0..0000000
--- a/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://launchpad.net/libindicator/+download .*/libindicator-([0-9.]+)\.tar\.gz
diff --git a/libindicator/Makefile.am b/libayatana-indicator/Makefile.am
index d85bf7a..7a1c617 100644
--- a/libindicator/Makefile.am
+++ b/libayatana-indicator/Makefile.am
@@ -1,17 +1,17 @@
 if USE_GTK3
 VER=3
-lib_LTLIBRARIES = libindicator3.la
+lib_LTLIBRARIES = libayatana-indicator3.la
 else
 VER=
-lib_LTLIBRARIES = libindicator.la
+lib_LTLIBRARIES = libayatana-indicator.la
 endif
 
 BUILT_SOURCES = indicator-object-enum-types.h indicator-object-enum-types.c
 CLEANFILES =
 DISTCLEANFILES =
 EXTRA_DIST = \
-	indicator3-0.$(INDICATOR_API_VERSION).pc.in.in \
-	indicator-0.$(INDICATOR_API_VERSION).pc.in.in
+	ayatana-indicator3-0.$(INDICATOR_API_VERSION).pc.in.in \
+	ayatana-indicator-0.$(INDICATOR_API_VERSION).pc.in.in
 
 INDICATOR_ABI_VERSION = 7
 INDICATOR_API_VERSION = 4
@@ -22,11 +22,11 @@ INDICATOR_API_VERSION = 4
 		-e "s|\@indicator_abi_version\@|$(INDICATOR_ABI_VERSION)|" \
 		$< > $@
 
-CLEANFILES += indicator$(VER)-0.$(INDICATOR_API_VERSION).pc
+CLEANFILES += ayatana-indicator$(VER)-0.$(INDICATOR_API_VERSION).pc
 
 include $(top_srcdir)/Makefile.am.marshal
 
-libindicatorincludedir=$(includedir)/libindicator$(VER)-0.$(INDICATOR_API_VERSION)/libindicator
+libayatana_indicatorincludedir=$(includedir)/libayatana-indicator$(VER)-0.$(INDICATOR_API_VERSION)/libayatana-indicator
 
 indicator_headers = \
 	indicator.h \
@@ -40,10 +40,10 @@ if USE_GTK3
 indicator_headers += indicator-ng.h
 endif
 
-libindicatorinclude_HEADERS = \
+libayatana_indicatorinclude_HEADERS = \
 	$(indicator_headers)
 
-libindicator_la_SOURCES = \
+libayatana_indicator_la_SOURCES = \
 	$(indicator_headers) \
 	dbus-shared.h \
 	gen-indicator-service.xml.h \
@@ -58,19 +58,19 @@ libindicator_la_SOURCES = \
 	indicator-service-manager.c
 
 if USE_GTK3
-libindicator_la_SOURCES += indicator-ng.c
+libayatana_indicator_la_SOURCES += indicator-ng.c
 endif
 
-libindicator_la_CFLAGS = \
+libayatana_indicator_la_CFLAGS = \
 	$(LIBINDICATOR_CFLAGS) \
 	$(COVERAGE_CFLAGS) \
-	-DG_LOG_DOMAIN=\"libindicator\" \
+	-DG_LOG_DOMAIN=\"libayatana-indicator\" \
 	-Wall -Werror -Wno-error=deprecated-declarations
 
-libindicator_la_LIBADD = \
+libayatana_indicator_la_LIBADD = \
 	$(LIBINDICATOR_LIBS)
 
-libindicator_la_LDFLAGS = \
+libayatana_indicator_la_LDFLAGS = \
 	$(COVERAGE_LDFLAGS) \
 	-version-info $(INDICATOR_ABI_VERSION):0:0 \
 	-no-undefined \
@@ -80,14 +80,14 @@ libindicator_la_LDFLAGS = \
 # Since we carefully use $(VER) in the right hand side above, we can assign the same values.
 # Only one version of the library is every compiled at the same time, so it is safe to reuse
 # the right hand sides like this.
-libindicator3includedir = $(libindicatorincludedir)
-libindicator3include_HEADERS = $(indicator_headers)
-libindicator3_la_SOURCES = $(libindicator_la_SOURCES)
-libindicator3_la_CFLAGS = $(libindicator_la_CFLAGS)
-libindicator3_la_LIBADD = $(libindicator_la_LIBADD)
-libindicator3_la_LDFLAGS = $(libindicator_la_LDFLAGS)
-
-pkgconfig_DATA = indicator$(VER)-0.$(INDICATOR_API_VERSION).pc
+libayatana_indicator3includedir = $(libayatana_indicatorincludedir)
+libayatana_indicator3include_HEADERS = $(indicator_headers)
+libayatana_indicator3_la_SOURCES = $(libayatana_indicator_la_SOURCES)
+libayatana_indicator3_la_CFLAGS = $(libayatana_indicator_la_CFLAGS)
+libayatana_indicator3_la_LIBADD = $(libayatana_indicator_la_LIBADD)
+libayatana_indicator3_la_LDFLAGS = $(libayatana_indicator_la_LDFLAGS)
+
+pkgconfig_DATA = ayatana-indicator$(VER)-0.$(INDICATOR_API_VERSION).pc
 pkgconfigdir = $(libdir)/pkgconfig
 
 glib_marshal_list = indicator-object-marshal.list
diff --git a/libayatana-indicator/Makefile.in b/libayatana-indicator/Makefile.in
new file mode 100644
index 0000000..021924c
--- /dev/null
+++ b/libayatana-indicator/Makefile.in
@@ -0,0 +1,1115 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Rules for generating marshal files using glib-genmarshal
+#
+# Define:
+# 	glib_marshal_list = marshal list file
+# 	glib_marshal_prefix = prefix for marshal functions
+#
+# before including Makefile.am.marshal. You will also need to have
+# the following targets already defined:
+#
+# 	CLEANFILES
+#	DISTCLEANFILES
+#	BUILT_SOURCES
+#	EXTRA_DIST
+#
+# Author: Emmanuele Bassi <ebassi@linux.intel.com>
+
+
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+@USE_GTK3_TRUE@am__append_1 = indicator-ng.h
+@USE_GTK3_TRUE@am__append_2 = indicator-ng.c
+subdir = libayatana-indicator
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/gcov.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am \
+	$(am__libayatana_indicator3include_HEADERS_DIST) \
+	$(am__libayatana_indicatorinclude_HEADERS_DIST) \
+	$(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES = ayatana-indicator-0.4.pc.in \
+	ayatana-indicator3-0.4.pc.in
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \
+	"$(DESTDIR)$(libayatana_indicator3includedir)" \
+	"$(DESTDIR)$(libayatana_indicatorincludedir)"
+LTLIBRARIES = $(lib_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+libayatana_indicator_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am__libayatana_indicator_la_SOURCES_DIST = indicator.h \
+	indicator-desktop-shortcuts.h indicator-image-helper.h \
+	indicator-object.h indicator-service.h \
+	indicator-service-manager.h indicator-ng.h dbus-shared.h \
+	gen-indicator-service.xml.h gen-indicator-service.xml.c \
+	indicator-object.c indicator-object-enum-types.c \
+	indicator-desktop-shortcuts.c indicator-image-helper.c \
+	indicator-object-marshal.h indicator-object-marshal.c \
+	indicator-service.c indicator-service-manager.c indicator-ng.c
+am__objects_1 =
+am__objects_2 = $(am__objects_1)
+@USE_GTK3_TRUE@am__objects_3 =  \
+@USE_GTK3_TRUE@	libayatana_indicator_la-indicator-ng.lo
+am_libayatana_indicator_la_OBJECTS = $(am__objects_2) \
+	libayatana_indicator_la-gen-indicator-service.xml.lo \
+	libayatana_indicator_la-indicator-object.lo \
+	libayatana_indicator_la-indicator-object-enum-types.lo \
+	libayatana_indicator_la-indicator-desktop-shortcuts.lo \
+	libayatana_indicator_la-indicator-image-helper.lo \
+	libayatana_indicator_la-indicator-object-marshal.lo \
+	libayatana_indicator_la-indicator-service.lo \
+	libayatana_indicator_la-indicator-service-manager.lo \
+	$(am__objects_3)
+libayatana_indicator_la_OBJECTS =  \
+	$(am_libayatana_indicator_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libayatana_indicator_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(libayatana_indicator_la_CFLAGS) $(CFLAGS) \
+	$(libayatana_indicator_la_LDFLAGS) $(LDFLAGS) -o $@
+@USE_GTK3_FALSE@am_libayatana_indicator_la_rpath = -rpath $(libdir)
+am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
+libayatana_indicator3_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am__libayatana_indicator3_la_SOURCES_DIST = indicator.h \
+	indicator-desktop-shortcuts.h indicator-image-helper.h \
+	indicator-object.h indicator-service.h \
+	indicator-service-manager.h indicator-ng.h dbus-shared.h \
+	gen-indicator-service.xml.h gen-indicator-service.xml.c \
+	indicator-object.c indicator-object-enum-types.c \
+	indicator-desktop-shortcuts.c indicator-image-helper.c \
+	indicator-object-marshal.h indicator-object-marshal.c \
+	indicator-service.c indicator-service-manager.c indicator-ng.c
+@USE_GTK3_TRUE@am__objects_4 =  \
+@USE_GTK3_TRUE@	libayatana_indicator3_la-indicator-ng.lo
+am__objects_5 = $(am__objects_2) \
+	libayatana_indicator3_la-gen-indicator-service.xml.lo \
+	libayatana_indicator3_la-indicator-object.lo \
+	libayatana_indicator3_la-indicator-object-enum-types.lo \
+	libayatana_indicator3_la-indicator-desktop-shortcuts.lo \
+	libayatana_indicator3_la-indicator-image-helper.lo \
+	libayatana_indicator3_la-indicator-object-marshal.lo \
+	libayatana_indicator3_la-indicator-service.lo \
+	libayatana_indicator3_la-indicator-service-manager.lo \
+	$(am__objects_4)
+am_libayatana_indicator3_la_OBJECTS = $(am__objects_5)
+libayatana_indicator3_la_OBJECTS =  \
+	$(am_libayatana_indicator3_la_OBJECTS)
+libayatana_indicator3_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(libayatana_indicator3_la_CFLAGS) $(CFLAGS) \
+	$(libayatana_indicator3_la_LDFLAGS) $(LDFLAGS) -o $@
+@USE_GTK3_TRUE@am_libayatana_indicator3_la_rpath = -rpath $(libdir)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libayatana_indicator_la_SOURCES) \
+	$(libayatana_indicator3_la_SOURCES)
+DIST_SOURCES = $(am__libayatana_indicator_la_SOURCES_DIST) \
+	$(am__libayatana_indicator3_la_SOURCES_DIST)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+DATA = $(pkgconfig_DATA)
+am__libayatana_indicator3include_HEADERS_DIST = indicator.h \
+	indicator-desktop-shortcuts.h indicator-image-helper.h \
+	indicator-object.h indicator-service.h \
+	indicator-service-manager.h indicator-ng.h
+am__libayatana_indicatorinclude_HEADERS_DIST = indicator.h \
+	indicator-desktop-shortcuts.h indicator-image-helper.h \
+	indicator-object.h indicator-service.h \
+	indicator-service-manager.h indicator-ng.h
+HEADERS = $(libayatana_indicator3include_HEADERS) \
+	$(libayatana_indicatorinclude_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+	$(srcdir)/ayatana-indicator-0.4.pc.in.in \
+	$(srcdir)/ayatana-indicator3-0.4.pc.in.in \
+	$(top_srcdir)/Makefile.am.marshal \
+	$(top_srcdir)/build-aux/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+COVERAGE_CFLAGS = @COVERAGE_CFLAGS@
+COVERAGE_CXXFLAGS = @COVERAGE_CXXFLAGS@
+COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@
+FGREP = @FGREP@
+GCOVR = @GCOVR@
+GENHTML = @GENHTML@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LCOV = @LCOV@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBDIR = @LIBDIR@
+LIBINDICATOR_CFLAGS = @LIBINDICATOR_CFLAGS@
+LIBINDICATOR_LIBS = @LIBINDICATOR_LIBS@
+LIBM = @LIBM@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PREFIX = @PREFIX@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SHTOOL = @SHTOOL@
+STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_aux_dir = @ac_aux_dir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+@USE_GTK3_FALSE@VER = 
+@USE_GTK3_TRUE@VER = 3
+@USE_GTK3_FALSE@lib_LTLIBRARIES = libayatana-indicator.la
+@USE_GTK3_TRUE@lib_LTLIBRARIES = libayatana-indicator3.la
+BUILT_SOURCES = indicator-object-enum-types.h \
+	indicator-object-enum-types.c $(marshal_h) $(marshal_c) \
+	gen-indicator-service.xml.h gen-indicator-service.xml.c
+CLEANFILES = ayatana-indicator$(VER)-0.$(INDICATOR_API_VERSION).pc \
+	stamp-marshal indicator-object-enum-types.h \
+	indicator-object-enum-types.c s-enum-types-h s-enum-types-c \
+	$(BUILT_SOURCES)
+DISTCLEANFILES = $(marshal_h) $(marshal_c)
+EXTRA_DIST = ayatana-indicator3-0.$(INDICATOR_API_VERSION).pc.in.in \
+	ayatana-indicator-0.$(INDICATOR_API_VERSION).pc.in.in \
+	$(glib_marshal_list) indicator-object-enum-types.h.template \
+	indicator-object-enum-types.c.template $(DBUS_SPECS)
+INDICATOR_ABI_VERSION = 7
+INDICATOR_API_VERSION = 4
+marshal_h = $(glib_marshal_list:.list=.h)
+marshal_c = $(glib_marshal_list:.list=.c)
+libayatana_indicatorincludedir = $(includedir)/libayatana-indicator$(VER)-0.$(INDICATOR_API_VERSION)/libayatana-indicator
+indicator_headers = indicator.h indicator-desktop-shortcuts.h \
+	indicator-image-helper.h indicator-object.h \
+	indicator-service.h indicator-service-manager.h \
+	$(am__append_1)
+libayatana_indicatorinclude_HEADERS = \
+	$(indicator_headers)
+
+libayatana_indicator_la_SOURCES = $(indicator_headers) dbus-shared.h \
+	gen-indicator-service.xml.h gen-indicator-service.xml.c \
+	indicator-object.c indicator-object-enum-types.c \
+	indicator-desktop-shortcuts.c indicator-image-helper.c \
+	indicator-object-marshal.h indicator-object-marshal.c \
+	indicator-service.c indicator-service-manager.c \
+	$(am__append_2)
+libayatana_indicator_la_CFLAGS = \
+	$(LIBINDICATOR_CFLAGS) \
+	$(COVERAGE_CFLAGS) \
+	-DG_LOG_DOMAIN=\"libayatana-indicator\" \
+	-Wall -Werror -Wno-error=deprecated-declarations
+
+libayatana_indicator_la_LIBADD = \
+	$(LIBINDICATOR_LIBS)
+
+libayatana_indicator_la_LDFLAGS = \
+	$(COVERAGE_LDFLAGS) \
+	-version-info $(INDICATOR_ABI_VERSION):0:0 \
+	-no-undefined \
+	-export-symbols-regex "^[^_].*"
+
+
+# We duplicate these here because Automake won't let us use $(VER) on the left hand side.
+# Since we carefully use $(VER) in the right hand side above, we can assign the same values.
+# Only one version of the library is every compiled at the same time, so it is safe to reuse
+# the right hand sides like this.
+libayatana_indicator3includedir = $(libayatana_indicatorincludedir)
+libayatana_indicator3include_HEADERS = $(indicator_headers)
+libayatana_indicator3_la_SOURCES = $(libayatana_indicator_la_SOURCES)
+libayatana_indicator3_la_CFLAGS = $(libayatana_indicator_la_CFLAGS)
+libayatana_indicator3_la_LIBADD = $(libayatana_indicator_la_LIBADD)
+libayatana_indicator3_la_LDFLAGS = $(libayatana_indicator_la_LDFLAGS)
+pkgconfig_DATA = ayatana-indicator$(VER)-0.$(INDICATOR_API_VERSION).pc
+pkgconfigdir = $(libdir)/pkgconfig
+glib_marshal_list = indicator-object-marshal.list
+glib_marshal_prefix = _indicator_object_marshal
+
+##################################
+# DBus Specs
+##################################
+DBUS_SPECS = \
+	indicator-service.xml
+
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.marshal $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libayatana-indicator/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu libayatana-indicator/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+$(top_srcdir)/Makefile.am.marshal $(am__empty):
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+ayatana-indicator-0.4.pc.in: $(top_builddir)/config.status $(srcdir)/ayatana-indicator-0.4.pc.in.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ayatana-indicator3-0.4.pc.in: $(top_builddir)/config.status $(srcdir)/ayatana-indicator3-0.4.pc.in.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	}
+
+uninstall-libLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
+	done
+
+clean-libLTLIBRARIES:
+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+	@list='$(lib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libayatana-indicator.la: $(libayatana_indicator_la_OBJECTS) $(libayatana_indicator_la_DEPENDENCIES) $(EXTRA_libayatana_indicator_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libayatana_indicator_la_LINK) $(am_libayatana_indicator_la_rpath) $(libayatana_indicator_la_OBJECTS) $(libayatana_indicator_la_LIBADD) $(LIBS)
+
+libayatana-indicator3.la: $(libayatana_indicator3_la_OBJECTS) $(libayatana_indicator3_la_DEPENDENCIES) $(EXTRA_libayatana_indicator3_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libayatana_indicator3_la_LINK) $(am_libayatana_indicator3_la_rpath) $(libayatana_indicator3_la_OBJECTS) $(libayatana_indicator3_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libayatana_indicator3_la-gen-indicator-service.xml.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libayatana_indicator3_la-indicator-desktop-shortcuts.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libayatana_indicator3_la-indicator-image-helper.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libayatana_indicator3_la-indicator-ng.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libayatana_indicator3_la-indicator-object-enum-types.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libayatana_indicator3_la-indicator-object-marshal.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libayatana_indicator3_la-indicator-object.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libayatana_indicator3_la-indicator-service-manager.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libayatana_indicator3_la-indicator-service.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libayatana_indicator_la-gen-indicator-service.xml.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libayatana_indicator_la-indicator-desktop-shortcuts.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libayatana_indicator_la-indicator-image-helper.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libayatana_indicator_la-indicator-ng.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libayatana_indicator_la-indicator-object-enum-types.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libayatana_indicator_la-indicator-object-marshal.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libayatana_indicator_la-indicator-object.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libayatana_indicator_la-indicator-service-manager.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libayatana_indicator_la-indicator-service.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+libayatana_indicator_la-gen-indicator-service.xml.lo: gen-indicator-service.xml.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libayatana_indicator_la_CFLAGS) $(CFLAGS) -MT libayatana_indicator_la-gen-indicator-service.xml.lo -MD -MP -MF $(DEPDIR)/libayatana_indicator_la-gen-indicator-service.xml.Tpo -c -o libayatana_indicator_la-gen-indicator-service.xml.lo `test -f 'gen-indicator-service.xml.c' || echo '$(srcdir)/'`gen-indicator-service.xml.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libayatana_indicator_la-gen-indicator-service.xml.Tpo $(DEPDIR)/libayatana_indicator_la-gen-indicator-service.xml.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gen-indicator-service.xml.c' object='libayatana_indicator_la-gen-indicator-service.xml.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libayatana_indicator_la_CFLAGS) $(CFLAGS) -c -o libayatana_indicator_la-gen-indicator-service.xml.lo `test -f 'gen-indicator-service.xml.c' || echo '$(srcdir)/'`gen-indicator-service.xml.c
+
+libayatana_indicator_la-indicator-object.lo: indicator-object.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libayatana_indicator_la_CFLAGS) $(CFLAGS) -MT libayatana_indicator_la-indicator-object.lo -MD -MP -MF $(DEPDIR)/libayatana_indicator_la-indicator-object.Tpo -c -o libayatana_indicator_la-indicator-object.lo `test -f 'indicator-object.c' || echo '$(srcdir)/'`indicator-object.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libayatana_indicator_la-indicator-object.Tpo $(DEPDIR)/libayatana_indicator_la-indicator-object.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='indicator-object.c' object='libayatana_indicator_la-indicator-object.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libayatana_indicator_la_CFLAGS) $(CFLAGS) -c -o libayatana_indicator_la-indicator-object.lo `test -f 'indicator-object.c' || echo '$(srcdir)/'`indicator-object.c
+
+libayatana_indicator_la-indicator-object-enum-types.lo: indicator-object-enum-types.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libayatana_indicator_la_CFLAGS) $(CFLAGS) -MT libayatana_indicator_la-indicator-object-enum-types.lo -MD -MP -MF $(DEPDIR)/libayatana_indicator_la-indicator-object-enum-types.Tpo -c -o libayatana_indicator_la-indicator-object-enum-types.lo `test -f 'indicator-object-enum-types.c' || echo '$(srcdir)/'`indicator-object-enum-types.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libayatana_indicator_la-indicator-object-enum-types.Tpo $(DEPDIR)/libayatana_indicator_la-indicator-object-enum-types.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='indicator-object-enum-types.c' object='libayatana_indicator_la-indicator-object-enum-types.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libayatana_indicator_la_CFLAGS) $(CFLAGS) -c -o libayatana_indicator_la-indicator-object-enum-types.lo `test -f 'indicator-object-enum-types.c' || echo '$(srcdir)/'`indicator-object-enum-types.c
+
+libayatana_indicator_la-indicator-desktop-shortcuts.lo: indicator-desktop-shortcuts.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libayatana_indicator_la_CFLAGS) $(CFLAGS) -MT libayatana_indicator_la-indicator-desktop-shortcuts.lo -MD -MP -MF $(DEPDIR)/libayatana_indicator_la-indicator-desktop-shortcuts.Tpo -c -o libayatana_indicator_la-indicator-desktop-shortcuts.lo `test -f 'indicator-desktop-shortcuts.c' || echo '$(srcdir)/'`indicator-desktop-shortcuts.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libayatana_indicator_la-indicator-desktop-shortcuts.Tpo $(DEPDIR)/libayatana_indicator_la-indicator-desktop-shortcuts.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='indicator-desktop-shortcuts.c' object='libayatana_indicator_la-indicator-desktop-shortcuts.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libayatana_indicator_la_CFLAGS) $(CFLAGS) -c -o libayatana_indicator_la-indicator-desktop-shortcuts.lo `test -f 'indicator-desktop-shortcuts.c' || echo '$(srcdir)/'`indicator-desktop-shortcuts.c
+
+libayatana_indicator_la-indicator-image-helper.lo: indicator-image-helper.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libayatana_indicator_la_CFLAGS) $(CFLAGS) -MT libayatana_indicator_la-indicator-image-helper.lo -MD -MP -MF $(DEPDIR)/libayatana_indicator_la-indicator-image-helper.Tpo -c -o libayatana_indicator_la-indicator-image-helper.lo `test -f 'indicator-image-helper.c' || echo '$(srcdir)/'`indicator-image-helper.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libayatana_indicator_la-indicator-image-helper.Tpo $(DEPDIR)/libayatana_indicator_la-indicator-image-helper.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='indicator-image-helper.c' object='libayatana_indicator_la-indicator-image-helper.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libayatana_indicator_la_CFLAGS) $(CFLAGS) -c -o libayatana_indicator_la-indicator-image-helper.lo `test -f 'indicator-image-helper.c' || echo '$(srcdir)/'`indicator-image-helper.c
+
+libayatana_indicator_la-indicator-object-marshal.lo: indicator-object-marshal.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libayatana_indicator_la_CFLAGS) $(CFLAGS) -MT libayatana_indicator_la-indicator-object-marshal.lo -MD -MP -MF $(DEPDIR)/libayatana_indicator_la-indicator-object-marshal.Tpo -c -o libayatana_indicator_la-indicator-object-marshal.lo `test -f 'indicator-object-marshal.c' || echo '$(srcdir)/'`indicator-object-marshal.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libayatana_indicator_la-indicator-object-marshal.Tpo $(DEPDIR)/libayatana_indicator_la-indicator-object-marshal.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='indicator-object-marshal.c' object='libayatana_indicator_la-indicator-object-marshal.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libayatana_indicator_la_CFLAGS) $(CFLAGS) -c -o libayatana_indicator_la-indicator-object-marshal.lo `test -f 'indicator-object-marshal.c' || echo '$(srcdir)/'`indicator-object-marshal.c
+
+libayatana_indicator_la-indicator-service.lo: indicator-service.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libayatana_indicator_la_CFLAGS) $(CFLAGS) -MT libayatana_indicator_la-indicator-service.lo -MD -MP -MF $(DEPDIR)/libayatana_indicator_la-indicator-service.Tpo -c -o libayatana_indicator_la-indicator-service.lo `test -f 'indicator-service.c' || echo '$(srcdir)/'`indicator-service.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libayatana_indicator_la-indicator-service.Tpo $(DEPDIR)/libayatana_indicator_la-indicator-service.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='indicator-service.c' object='libayatana_indicator_la-indicator-service.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libayatana_indicator_la_CFLAGS) $(CFLAGS) -c -o libayatana_indicator_la-indicator-service.lo `test -f 'indicator-service.c' || echo '$(srcdir)/'`indicator-service.c
+
+libayatana_indicator_la-indicator-service-manager.lo: indicator-service-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libayatana_indicator_la_CFLAGS) $(CFLAGS) -MT libayatana_indicator_la-indicator-service-manager.lo -MD -MP -MF $(DEPDIR)/libayatana_indicator_la-indicator-service-manager.Tpo -c -o libayatana_indicator_la-indicator-service-manager.lo `test -f 'indicator-service-manager.c' || echo '$(srcdir)/'`indicator-service-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libayatana_indicator_la-indicator-service-manager.Tpo $(DEPDIR)/libayatana_indicator_la-indicator-service-manager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='indicator-service-manager.c' object='libayatana_indicator_la-indicator-service-manager.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libayatana_indicator_la_CFLAGS) $(CFLAGS) -c -o libayatana_indicator_la-indicator-service-manager.lo `test -f 'indicator-service-manager.c' || echo '$(srcdir)/'`indicator-service-manager.c
+
+libayatana_indicator_la-indicator-ng.lo: indicator-ng.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libayatana_indicator_la_CFLAGS) $(CFLAGS) -MT libayatana_indicator_la-indicator-ng.lo -MD -MP -MF $(DEPDIR)/libayatana_indicator_la-indicator-ng.Tpo -c -o libayatana_indicator_la-indicator-ng.lo `test -f 'indicator-ng.c' || echo '$(srcdir)/'`indicator-ng.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libayatana_indicator_la-indicator-ng.Tpo $(DEPDIR)/libayatana_indicator_la-indicator-ng.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='indicator-ng.c' object='libayatana_indicator_la-indicator-ng.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libayatana_indicator_la_CFLAGS) $(CFLAGS) -c -o libayatana_indicator_la-indicator-ng.lo `test -f 'indicator-ng.c' || echo '$(srcdir)/'`indicator-ng.c
+
+libayatana_indicator3_la-gen-indicator-service.xml.lo: gen-indicator-service.xml.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libayatana_indicator3_la_CFLAGS) $(CFLAGS) -MT libayatana_indicator3_la-gen-indicator-service.xml.lo -MD -MP -MF $(DEPDIR)/libayatana_indicator3_la-gen-indicator-service.xml.Tpo -c -o libayatana_indicator3_la-gen-indicator-service.xml.lo `test -f 'gen-indicator-service.xml.c' || echo '$(srcdir)/'`gen-indicator-service.xml.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libayatana_indicator3_la-gen-indicator-service.xml.Tpo $(DEPDIR)/libayatana_indicator3_la-gen-indicator-service.xml.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gen-indicator-service.xml.c' object='libayatana_indicator3_la-gen-indicator-service.xml.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libayatana_indicator3_la_CFLAGS) $(CFLAGS) -c -o libayatana_indicator3_la-gen-indicator-service.xml.lo `test -f 'gen-indicator-service.xml.c' || echo '$(srcdir)/'`gen-indicator-service.xml.c
+
+libayatana_indicator3_la-indicator-object.lo: indicator-object.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libayatana_indicator3_la_CFLAGS) $(CFLAGS) -MT libayatana_indicator3_la-indicator-object.lo -MD -MP -MF $(DEPDIR)/libayatana_indicator3_la-indicator-object.Tpo -c -o libayatana_indicator3_la-indicator-object.lo `test -f 'indicator-object.c' || echo '$(srcdir)/'`indicator-object.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libayatana_indicator3_la-indicator-object.Tpo $(DEPDIR)/libayatana_indicator3_la-indicator-object.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='indicator-object.c' object='libayatana_indicator3_la-indicator-object.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libayatana_indicator3_la_CFLAGS) $(CFLAGS) -c -o libayatana_indicator3_la-indicator-object.lo `test -f 'indicator-object.c' || echo '$(srcdir)/'`indicator-object.c
+
+libayatana_indicator3_la-indicator-object-enum-types.lo: indicator-object-enum-types.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libayatana_indicator3_la_CFLAGS) $(CFLAGS) -MT libayatana_indicator3_la-indicator-object-enum-types.lo -MD -MP -MF $(DEPDIR)/libayatana_indicator3_la-indicator-object-enum-types.Tpo -c -o libayatana_indicator3_la-indicator-object-enum-types.lo `test -f 'indicator-object-enum-types.c' || echo '$(srcdir)/'`indicator-object-enum-types.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libayatana_indicator3_la-indicator-object-enum-types.Tpo $(DEPDIR)/libayatana_indicator3_la-indicator-object-enum-types.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='indicator-object-enum-types.c' object='libayatana_indicator3_la-indicator-object-enum-types.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libayatana_indicator3_la_CFLAGS) $(CFLAGS) -c -o libayatana_indicator3_la-indicator-object-enum-types.lo `test -f 'indicator-object-enum-types.c' || echo '$(srcdir)/'`indicator-object-enum-types.c
+
+libayatana_indicator3_la-indicator-desktop-shortcuts.lo: indicator-desktop-shortcuts.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libayatana_indicator3_la_CFLAGS) $(CFLAGS) -MT libayatana_indicator3_la-indicator-desktop-shortcuts.lo -MD -MP -MF $(DEPDIR)/libayatana_indicator3_la-indicator-desktop-shortcuts.Tpo -c -o libayatana_indicator3_la-indicator-desktop-shortcuts.lo `test -f 'indicator-desktop-shortcuts.c' || echo '$(srcdir)/'`indicator-desktop-shortcuts.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libayatana_indicator3_la-indicator-desktop-shortcuts.Tpo $(DEPDIR)/libayatana_indicator3_la-indicator-desktop-shortcuts.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='indicator-desktop-shortcuts.c' object='libayatana_indicator3_la-indicator-desktop-shortcuts.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libayatana_indicator3_la_CFLAGS) $(CFLAGS) -c -o libayatana_indicator3_la-indicator-desktop-shortcuts.lo `test -f 'indicator-desktop-shortcuts.c' || echo '$(srcdir)/'`indicator-desktop-shortcuts.c
+
+libayatana_indicator3_la-indicator-image-helper.lo: indicator-image-helper.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libayatana_indicator3_la_CFLAGS) $(CFLAGS) -MT libayatana_indicator3_la-indicator-image-helper.lo -MD -MP -MF $(DEPDIR)/libayatana_indicator3_la-indicator-image-helper.Tpo -c -o libayatana_indicator3_la-indicator-image-helper.lo `test -f 'indicator-image-helper.c' || echo '$(srcdir)/'`indicator-image-helper.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libayatana_indicator3_la-indicator-image-helper.Tpo $(DEPDIR)/libayatana_indicator3_la-indicator-image-helper.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='indicator-image-helper.c' object='libayatana_indicator3_la-indicator-image-helper.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libayatana_indicator3_la_CFLAGS) $(CFLAGS) -c -o libayatana_indicator3_la-indicator-image-helper.lo `test -f 'indicator-image-helper.c' || echo '$(srcdir)/'`indicator-image-helper.c
+
+libayatana_indicator3_la-indicator-object-marshal.lo: indicator-object-marshal.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libayatana_indicator3_la_CFLAGS) $(CFLAGS) -MT libayatana_indicator3_la-indicator-object-marshal.lo -MD -MP -MF $(DEPDIR)/libayatana_indicator3_la-indicator-object-marshal.Tpo -c -o libayatana_indicator3_la-indicator-object-marshal.lo `test -f 'indicator-object-marshal.c' || echo '$(srcdir)/'`indicator-object-marshal.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libayatana_indicator3_la-indicator-object-marshal.Tpo $(DEPDIR)/libayatana_indicator3_la-indicator-object-marshal.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='indicator-object-marshal.c' object='libayatana_indicator3_la-indicator-object-marshal.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libayatana_indicator3_la_CFLAGS) $(CFLAGS) -c -o libayatana_indicator3_la-indicator-object-marshal.lo `test -f 'indicator-object-marshal.c' || echo '$(srcdir)/'`indicator-object-marshal.c
+
+libayatana_indicator3_la-indicator-service.lo: indicator-service.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libayatana_indicator3_la_CFLAGS) $(CFLAGS) -MT libayatana_indicator3_la-indicator-service.lo -MD -MP -MF $(DEPDIR)/libayatana_indicator3_la-indicator-service.Tpo -c -o libayatana_indicator3_la-indicator-service.lo `test -f 'indicator-service.c' || echo '$(srcdir)/'`indicator-service.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libayatana_indicator3_la-indicator-service.Tpo $(DEPDIR)/libayatana_indicator3_la-indicator-service.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='indicator-service.c' object='libayatana_indicator3_la-indicator-service.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libayatana_indicator3_la_CFLAGS) $(CFLAGS) -c -o libayatana_indicator3_la-indicator-service.lo `test -f 'indicator-service.c' || echo '$(srcdir)/'`indicator-service.c
+
+libayatana_indicator3_la-indicator-service-manager.lo: indicator-service-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libayatana_indicator3_la_CFLAGS) $(CFLAGS) -MT libayatana_indicator3_la-indicator-service-manager.lo -MD -MP -MF $(DEPDIR)/libayatana_indicator3_la-indicator-service-manager.Tpo -c -o libayatana_indicator3_la-indicator-service-manager.lo `test -f 'indicator-service-manager.c' || echo '$(srcdir)/'`indicator-service-manager.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libayatana_indicator3_la-indicator-service-manager.Tpo $(DEPDIR)/libayatana_indicator3_la-indicator-service-manager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='indicator-service-manager.c' object='libayatana_indicator3_la-indicator-service-manager.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libayatana_indicator3_la_CFLAGS) $(CFLAGS) -c -o libayatana_indicator3_la-indicator-service-manager.lo `test -f 'indicator-service-manager.c' || echo '$(srcdir)/'`indicator-service-manager.c
+
+libayatana_indicator3_la-indicator-ng.lo: indicator-ng.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libayatana_indicator3_la_CFLAGS) $(CFLAGS) -MT libayatana_indicator3_la-indicator-ng.lo -MD -MP -MF $(DEPDIR)/libayatana_indicator3_la-indicator-ng.Tpo -c -o libayatana_indicator3_la-indicator-ng.lo `test -f 'indicator-ng.c' || echo '$(srcdir)/'`indicator-ng.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libayatana_indicator3_la-indicator-ng.Tpo $(DEPDIR)/libayatana_indicator3_la-indicator-ng.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='indicator-ng.c' object='libayatana_indicator3_la-indicator-ng.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libayatana_indicator3_la_CFLAGS) $(CFLAGS) -c -o libayatana_indicator3_la-indicator-ng.lo `test -f 'indicator-ng.c' || echo '$(srcdir)/'`indicator-ng.c
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-pkgconfigDATA: $(pkgconfig_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
+	done
+
+uninstall-pkgconfigDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
+install-libayatana_indicator3includeHEADERS: $(libayatana_indicator3include_HEADERS)
+	@$(NORMAL_INSTALL)
+	@list='$(libayatana_indicator3include_HEADERS)'; test -n "$(libayatana_indicator3includedir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libayatana_indicator3includedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libayatana_indicator3includedir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libayatana_indicator3includedir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libayatana_indicator3includedir)" || exit $$?; \
+	done
+
+uninstall-libayatana_indicator3includeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(libayatana_indicator3include_HEADERS)'; test -n "$(libayatana_indicator3includedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(libayatana_indicator3includedir)'; $(am__uninstall_files_from_dir)
+install-libayatana_indicatorincludeHEADERS: $(libayatana_indicatorinclude_HEADERS)
+	@$(NORMAL_INSTALL)
+	@list='$(libayatana_indicatorinclude_HEADERS)'; test -n "$(libayatana_indicatorincludedir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libayatana_indicatorincludedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libayatana_indicatorincludedir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libayatana_indicatorincludedir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libayatana_indicatorincludedir)" || exit $$?; \
+	done
+
+uninstall-libayatana_indicatorincludeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(libayatana_indicatorinclude_HEADERS)'; test -n "$(libayatana_indicatorincludedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(libayatana_indicatorincludedir)'; $(am__uninstall_files_from_dir)
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
+all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
+installdirs:
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libayatana_indicator3includedir)" "$(DESTDIR)$(libayatana_indicatorincludedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+clean: clean-am
+
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-libayatana_indicator3includeHEADERS \
+	install-libayatana_indicatorincludeHEADERS \
+	install-pkgconfigDATA
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-libLTLIBRARIES
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-libLTLIBRARIES \
+	uninstall-libayatana_indicator3includeHEADERS \
+	uninstall-libayatana_indicatorincludeHEADERS \
+	uninstall-pkgconfigDATA
+
+.MAKE: all check install install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-libLTLIBRARIES \
+	install-libayatana_indicator3includeHEADERS \
+	install-libayatana_indicatorincludeHEADERS install-man \
+	install-pdf install-pdf-am install-pkgconfigDATA install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-libLTLIBRARIES \
+	uninstall-libayatana_indicator3includeHEADERS \
+	uninstall-libayatana_indicatorincludeHEADERS \
+	uninstall-pkgconfigDATA
+
+.PRECIOUS: Makefile
+
+
+%.pc: %.pc.in
+	sed \
+		-e "s|\@indicator_api_version\@|$(INDICATOR_API_VERSION)|" \
+		-e "s|\@indicator_abi_version\@|$(INDICATOR_ABI_VERSION)|" \
+		$< > $@
+
+stamp-marshal: $(glib_marshal_list)
+	$(QUIET_GEN)$(GLIB_GENMARSHAL) \
+		--prefix=$(glib_marshal_prefix) \
+		--header \
+	$(srcdir)/$(glib_marshal_list) > xgen-mh \
+	&& (cmp -s xgen-mh $(marshal_h) || cp -f xgen-mh $(marshal_h)) \
+	&& rm -f xgen-mh \
+	&& echo timestamp > $(@F)
+
+$(marshal_h): stamp-marshal
+	@true
+
+$(marshal_c): $(marshal_h)
+	$(QUIET_GEN)(echo "#include \"$(marshal_h)\"" ; \
+	$(GLIB_GENMARSHAL) \
+		--prefix=$(glib_marshal_prefix) \
+		--body \
+	$(srcdir)/$(glib_marshal_list)) > xgen-mc \
+	&& cp xgen-mc $(marshal_c) \
+	&& rm -f xgen-mc
+
+indicator-object-enum-types.h: s-enum-types-h
+	@true
+s-enum-types-h: $(indicator_headers)
+	( cd $(srcdir) && $(GLIB_MKENUMS) --template $(abs_srcdir)/indicator-object-enum-types.h.template								\
+		$(indicator_headers) ) >> tmp-indicator-object-enum-types.h											\
+	&& (cmp -s tmp-indicator-object-enum-types.h indicator-object-enum-types.h || cp tmp-indicator-object-enum-types.h indicator-object-enum-types.h )	\
+	&& rm -f tmp-indicator-object-enum-types.h && echo timestamp > $(@F)
+
+indicator-object-enum-types.c: s-enum-types-c
+	@true
+s-enum-types-c: $(indicator_headers)
+	( cd $(srcdir) && $(GLIB_MKENUMS) --template $(abs_srcdir)/indicator-object-enum-types.c.template								\
+		$(indicator_headers) ) > tmp-indicator-object-enum-types.c											\
+	&& (cmp -s tmp-indicator-object-enum-types.c indicator-object-enum-types.c || cp tmp-indicator-object-enum-types.c indicator-object-enum-types.c )	\
+	&& rm -f tmp-indicator-object-enum-types.c
+
+gen-%.xml.h: %.xml
+	@echo "Building $@ from $<"
+	@echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<))));" > $@
+
+gen-%.xml.c: %.xml
+	@echo "Building $@ from $<"
+	echo "const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<)))) = " > $@
+	@sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@
+	@echo ";" >> $@
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/libindicator/indicator-0.4.pc.in.in b/libayatana-indicator/ayatana-indicator-0.4.pc.in.in
index b5de163..b5de163 100644
--- a/libindicator/indicator-0.4.pc.in.in
+++ b/libayatana-indicator/ayatana-indicator-0.4.pc.in.in
diff --git a/libindicator/indicator3-0.4.pc.in.in b/libayatana-indicator/ayatana-indicator3-0.4.pc.in.in
index e2ea0ae..8dc337c 100644
--- a/libindicator/indicator3-0.4.pc.in.in
+++ b/libayatana-indicator/ayatana-indicator3-0.4.pc.in.in
@@ -14,4 +14,3 @@ Libs: -lindicator3
 Name: libindicator3
 Description: libindicator3.
 Version: @VERSION@
-
diff --git a/libindicator/dbus-shared.h b/libayatana-indicator/dbus-shared.h
index b55acef..b55acef 100644
--- a/libindicator/dbus-shared.h
+++ b/libayatana-indicator/dbus-shared.h
diff --git a/libindicator/indicator-desktop-shortcuts.c b/libayatana-indicator/indicator-desktop-shortcuts.c
index 0806321..0806321 100644
--- a/libindicator/indicator-desktop-shortcuts.c
+++ b/libayatana-indicator/indicator-desktop-shortcuts.c
diff --git a/libindicator/indicator-desktop-shortcuts.h b/libayatana-indicator/indicator-desktop-shortcuts.h
index fb997ea..fb997ea 100644
--- a/libindicator/indicator-desktop-shortcuts.h
+++ b/libayatana-indicator/indicator-desktop-shortcuts.h
diff --git a/libindicator/indicator-image-helper.c b/libayatana-indicator/indicator-image-helper.c
index 27c332f..27c332f 100644
--- a/libindicator/indicator-image-helper.c
+++ b/libayatana-indicator/indicator-image-helper.c
diff --git a/libindicator/indicator-image-helper.h b/libayatana-indicator/indicator-image-helper.h
index 290f4e2..290f4e2 100644
--- a/libindicator/indicator-image-helper.h
+++ b/libayatana-indicator/indicator-image-helper.h
diff --git a/libindicator/indicator-ng.c b/libayatana-indicator/indicator-ng.c
index d1d2854..e645522 100644
--- a/libindicator/indicator-ng.c
+++ b/libayatana-indicator/indicator-ng.c
@@ -392,7 +392,7 @@ indicator_ng_menu_changed (GMenuModel *menu,
       g_clear_pointer (&self->scroll_action, g_free);
       g_clear_pointer (&self->secondary_action, g_free);
 
-      if (indicator_ng_menu_item_is_of_type (self->menu, 0, "com.canonical.indicator.root"))
+      if (indicator_ng_menu_item_is_of_type (self->menu, 0, "org.ayatana.indicator.root"))
         {
           GMenuModel *popup;
           gchar *action;
@@ -435,7 +435,7 @@ indicator_ng_menu_changed (GMenuModel *menu,
           indicator_ng_update_entry (self);
         }
       else
-        g_warning ("indicator menu item must be of type 'com.canonical.indicator.root'");
+        g_warning ("indicator menu item must be of type 'org.ayatana.indicator.root'");
     }
 }
 
diff --git a/libindicator/indicator-ng.h b/libayatana-indicator/indicator-ng.h
index f074a47..f074a47 100644
--- a/libindicator/indicator-ng.h
+++ b/libayatana-indicator/indicator-ng.h
diff --git a/libindicator/indicator-object-enum-types.c.template b/libayatana-indicator/indicator-object-enum-types.c.template
index e5b3352..e5b3352 100644
--- a/libindicator/indicator-object-enum-types.c.template
+++ b/libayatana-indicator/indicator-object-enum-types.c.template
diff --git a/libindicator/indicator-object-enum-types.h.template b/libayatana-indicator/indicator-object-enum-types.h.template
index 2ac8ef8..2ac8ef8 100644
--- a/libindicator/indicator-object-enum-types.h.template
+++ b/libayatana-indicator/indicator-object-enum-types.h.template
diff --git a/libindicator/indicator-object-marshal.list b/libayatana-indicator/indicator-object-marshal.list
index 4896ac4..4896ac4 100644
--- a/libindicator/indicator-object-marshal.list
+++ b/libayatana-indicator/indicator-object-marshal.list
diff --git a/libindicator/indicator-object.c b/libayatana-indicator/indicator-object.c
index 0a1a04e..0a1a04e 100644
--- a/libindicator/indicator-object.c
+++ b/libayatana-indicator/indicator-object.c
diff --git a/libindicator/indicator-object.h b/libayatana-indicator/indicator-object.h
index e542c0d..e542c0d 100644
--- a/libindicator/indicator-object.h
+++ b/libayatana-indicator/indicator-object.h
diff --git a/libindicator/indicator-service-manager.c b/libayatana-indicator/indicator-service-manager.c
index a427954..a427954 100644
--- a/libindicator/indicator-service-manager.c
+++ b/libayatana-indicator/indicator-service-manager.c
diff --git a/libindicator/indicator-service-manager.h b/libayatana-indicator/indicator-service-manager.h
index 7d444c6..7d444c6 100644
--- a/libindicator/indicator-service-manager.h
+++ b/libayatana-indicator/indicator-service-manager.h
diff --git a/libindicator/indicator-service.c b/libayatana-indicator/indicator-service.c
index 1cd6964..1cd6964 100644
--- a/libindicator/indicator-service.c
+++ b/libayatana-indicator/indicator-service.c
diff --git a/libindicator/indicator-service.h b/libayatana-indicator/indicator-service.h
index bda9cb7..bda9cb7 100644
--- a/libindicator/indicator-service.h
+++ b/libayatana-indicator/indicator-service.h
diff --git a/libindicator/indicator-service.xml b/libayatana-indicator/indicator-service.xml
index 71ef4df..71ef4df 100644
--- a/libindicator/indicator-service.xml
+++ b/libayatana-indicator/indicator-service.xml
diff --git a/libindicator/indicator.h b/libayatana-indicator/indicator.h
index 8bff270..8bff270 100644
--- a/libindicator/indicator.h
+++ b/libayatana-indicator/indicator.h
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 96825f3..93fcd14 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,7 +1,7 @@
 if USE_GTK3
-INDICATOR_LIB = -lindicator3
+INDICATOR_LIB = -layatana-indicator3
 else
-INDICATOR_LIB = -lindicator
+INDICATOR_LIB = -layatana-indicator
 endif
 
 TESTS =
@@ -27,7 +27,7 @@ EXTRA_DIST = \
 	service-manager-connect.service.in \
 	service-version-bad.service.in \
 	service-version-good.service.in \
-	com.canonical.indicator.test.service.in
+	org.ayatana.indicator.test.service.in
 
 #############################
 # Test Loader
@@ -45,7 +45,7 @@ test_loader_CFLAGS = \
 
 test_loader_LDADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libindicator/.libs \
+	-L$(top_builddir)/libayatana-indicator/.libs \
 	$(INDICATOR_LIB)
 
 #############################
@@ -65,7 +65,7 @@ test_desktop_shortcuts_CFLAGS = \
 
 test_desktop_shortcuts_LDADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libindicator/.libs \
+	-L$(top_builddir)/libayatana-indicator/.libs \
 	$(INDICATOR_LIB)
 
 DS_XML_REPORT  = desktop-shortcuts-check-results.xml
@@ -97,7 +97,7 @@ libdummy_indicator_blank_la_CFLAGS = \
 
 libdummy_indicator_blank_la_LIBADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libindicator/.libs \
+	-L$(top_builddir)/libayatana-indicator/.libs \
 	$(INDICATOR_LIB)
 
 libdummy_indicator_blank_la_LDFLAGS = \
@@ -117,7 +117,7 @@ libdummy_indicator_null_la_CFLAGS = \
 
 libdummy_indicator_null_la_LIBADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libindicator/.libs \
+	-L$(top_builddir)/libayatana-indicator/.libs \
 	$(INDICATOR_LIB)
 
 libdummy_indicator_null_la_LDFLAGS = \
@@ -137,7 +137,7 @@ libdummy_indicator_signaler_la_CFLAGS = \
 
 libdummy_indicator_signaler_la_LIBADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libindicator/.libs \
+	-L$(top_builddir)/libayatana-indicator/.libs \
 	$(INDICATOR_LIB)
 
 libdummy_indicator_signaler_la_LDFLAGS = \
@@ -157,7 +157,7 @@ libdummy_indicator_simple_la_CFLAGS = \
 
 libdummy_indicator_simple_la_LIBADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libindicator/.libs \
+	-L$(top_builddir)/libayatana-indicator/.libs \
 	$(INDICATOR_LIB)
 
 libdummy_indicator_simple_la_LDFLAGS = \
@@ -178,7 +178,7 @@ libdummy_indicator_entry_func_la_CFLAGS = \
 
 libdummy_indicator_entry_func_la_LIBADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libindicator/.libs \
+	-L$(top_builddir)/libayatana-indicator/.libs \
 	$(INDICATOR_LIB)
 
 libdummy_indicator_entry_func_la_LDFLAGS = \
@@ -198,7 +198,7 @@ libdummy_indicator_visible_la_CFLAGS = \
 
 libdummy_indicator_visible_la_LIBADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libindicator/.libs \
+	-L$(top_builddir)/libayatana-indicator/.libs \
 	$(INDICATOR_LIB)
 
 libdummy_indicator_visible_la_LDFLAGS = \
@@ -220,7 +220,7 @@ service_shutdown_timeout_CFLAGS = \
 
 service_shutdown_timeout_LDADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libindicator/.libs \
+	-L$(top_builddir)/libayatana-indicator/.libs \
 	$(INDICATOR_LIB)
 
 service-shutdown-timeout-tester: service-shutdown-timeout Makefile
@@ -246,7 +246,7 @@ service_manager_no_connect_CFLAGS = \
 
 service_manager_no_connect_LDADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libindicator/.libs \
+	-L$(top_builddir)/libayatana-indicator/.libs \
 	$(INDICATOR_LIB)
 
 service-manager-no-connect-tester: service-manager-no-connect Makefile.am
@@ -262,10 +262,10 @@ DISTCLEANFILES += service-manager-no-connect-tester
 #############################
 
 session.conf: $(srcdir)/session.conf.in Makefile.am
-	sed -e "s|\@servicedir\@|$(abspath $(builddir))|" $< > $@
+	sed -e "s|\@servicedir\@|$(abs_builddir)|" $< > $@
 
 service-manager-connect.service: $(srcdir)/service-manager-connect.service.in Makefile.am
-	sed -e "s|\@builddir\@|$(abspath $(builddir))|" $< > $@
+	sed -e "s|\@builddir\@|$(abs_builddir)|" $< > $@
 
 check_PROGRAMS += service-manager-connect
 
@@ -278,7 +278,7 @@ service_manager_connect_CFLAGS = \
 
 service_manager_connect_LDADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libindicator/.libs \
+	-L$(top_builddir)/libayatana-indicator/.libs \
 	$(INDICATOR_LIB)
 
 check_PROGRAMS += service-manager-connect-service
@@ -292,7 +292,7 @@ service_manager_connect_service_CFLAGS = \
 
 service_manager_connect_service_LDADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libindicator/.libs \
+	-L$(top_builddir)/libayatana-indicator/.libs \
 	$(INDICATOR_LIB)
 
 service-manager-connect-tester: service-manager-connect service-manager-connect-service session.conf service-manager-connect.service Makefile.am
@@ -308,10 +308,10 @@ DISTCLEANFILES += service-manager-connect-tester session.conf service-manager-co
 #############################
 
 service-version-good.service: $(srcdir)/service-version-good.service.in Makefile.am
-	sed -e "s|\@builddir\@|$(abspath $(builddir))|" $< > $@
+	sed -e "s|\@builddir\@|$(abs_builddir)|" $< > $@
 
 service-version-bad.service: $(srcdir)/service-version-bad.service.in Makefile.am
-	sed -e "s|\@builddir\@|$(abspath $(builddir))|" $< > $@
+	sed -e "s|\@builddir\@|$(abs_builddir)|" $< > $@
 
 check_PROGRAMS += service-version-manager
 
@@ -325,7 +325,7 @@ service_version_manager_CFLAGS = \
 
 service_version_manager_LDADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libindicator/.libs \
+	-L$(top_builddir)/libayatana-indicator/.libs \
 	$(INDICATOR_LIB)
 
 check_PROGRAMS += service-version-bad-service
@@ -340,7 +340,7 @@ service_version_bad_service_CFLAGS = \
 
 service_version_bad_service_LDADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libindicator/.libs \
+	-L$(top_builddir)/libayatana-indicator/.libs \
 	$(INDICATOR_LIB)
 
 check_PROGRAMS += service-version-good-service
@@ -355,7 +355,7 @@ service_version_good_service_CFLAGS = \
 
 service_version_good_service_LDADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libindicator/.libs \
+	-L$(top_builddir)/libayatana-indicator/.libs \
 	$(INDICATOR_LIB)
 
 service-version-tester: service-version-manager service-version-bad-service service-version-good-service session.conf service-version-bad.service service-version-good.service Makefile.am
@@ -382,7 +382,7 @@ service_version_multiwatch_manager_CFLAGS = \
 
 service_version_multiwatch_manager_LDADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libindicator/.libs \
+	-L$(top_builddir)/libayatana-indicator/.libs \
 	$(INDICATOR_LIB)
 
 check_PROGRAMS += service-version-multiwatch-manager-impolite
@@ -397,7 +397,7 @@ service_version_multiwatch_manager_impolite_CFLAGS = \
 
 service_version_multiwatch_manager_impolite_LDADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libindicator/.libs \
+	-L$(top_builddir)/libayatana-indicator/.libs \
 	$(INDICATOR_LIB)
 
 check_PROGRAMS += service-version-multiwatch-service
@@ -412,7 +412,7 @@ service_version_multiwatch_service_CFLAGS = \
 
 service_version_multiwatch_service_LDADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libindicator/.libs \
+	-L$(top_builddir)/libayatana-indicator/.libs \
 	$(INDICATOR_LIB)
 
 service-version-multiwatch-tester: service-version-multiwatch-manager service-version-multiwatch-service service-version-multiwatch-manager-impolite Makefile.am
@@ -438,7 +438,7 @@ service_manager_nostart_connect_CFLAGS = \
 
 service_manager_nostart_connect_LDADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libindicator/.libs \
+	-L$(top_builddir)/libayatana-indicator/.libs \
 	$(INDICATOR_LIB)
 
 service-manager-connect-nostart-tester: service-manager-nostart-connect service-manager-connect-service Makefile.am
@@ -473,8 +473,8 @@ DISTCLEANFILES += $(XML_REPORT) $(HTML_REPORT)
 
 if USE_GTK3
 
-com.canonical.indicator.test.service: com.canonical.indicator.test.service.in Makefile.am
-	sed -e "s|\@builddir\@|$(abspath $(builddir))|" $< > $@
+org.ayatana.indicator.test.service: org.ayatana.indicator.test.service.in Makefile.am
+	sed -e "s|\@builddir\@|$(abs_builddir)|" $< > $@
 
 check_PROGRAMS += test-indicator-ng
 
@@ -489,7 +489,7 @@ test_indicator_ng_CFLAGS = \
 
 test_indicator_ng_LDADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libindicator/.libs \
+	-L$(top_builddir)/libayatana-indicator/.libs \
 	$(INDICATOR_LIB)
 
 TESTS += test-indicator-ng
@@ -502,8 +502,8 @@ indicator_test_service_SOURCES = indicator-test-service.c
 indicator_test_service_CFLAGS = $(LIBINDICATOR_CFLAGS)
 indicator_test_service_LDADD = $(LIBINDICATOR_LIBS)
 
-EXTRA_indicator_test_service_DEPENDENCIES = com.canonical.indicator.test.service
+EXTRA_indicator_test_service_DEPENDENCIES = org.ayatana.indicator.test.service
 
-DISTCLEANFILES += indicator-test-service com.canonical.indicator.test.service
+DISTCLEANFILES += indicator-test-service org.ayatana.indicator.test.service
 
 endif
diff --git a/tests/com.canonical.indicator.no-such-service b/tests/com.canonical.indicator.no-such-service
deleted file mode 100644
index 54cc4fd..0000000
--- a/tests/com.canonical.indicator.no-such-service
+++ /dev/null
@@ -1,3 +0,0 @@
-[Indicator Service]
-Name=indicator-test
-ObjectPath=/com/canonical/indicator/test
diff --git a/tests/com.canonical.indicator.test b/tests/com.canonical.indicator.test
deleted file mode 100644
index 0c7122f..0000000
--- a/tests/com.canonical.indicator.test
+++ /dev/null
@@ -1,6 +0,0 @@
-[Indicator Service]
-Name=indicator-test
-ObjectPath=/com/canonical/indicator/test
-
-[desktop]
-ObjectPath=/com/canonical/indicator/test/desktop
diff --git a/tests/dummy-indicator-blank.c b/tests/dummy-indicator-blank.c
index 874284b..dcbb99f 100644
--- a/tests/dummy-indicator-blank.c
+++ b/tests/dummy-indicator-blank.c
@@ -21,7 +21,7 @@ License along with this library. If not, see
 */
 
 
-#include "libindicator/indicator.h"
+#include "libayatana-indicator/indicator.h"
 
 INDICATOR_SET_VERSION
 
diff --git a/tests/dummy-indicator-entry-func.h b/tests/dummy-indicator-entry-func.h
index f5c8264..c1fa8d3 100644
--- a/tests/dummy-indicator-entry-func.h
+++ b/tests/dummy-indicator-entry-func.h
@@ -26,8 +26,8 @@ License along with this library. If not, see
 #include <glib.h>
 #include <glib-object.h>
 
-#include "libindicator/indicator.h"
-#include "libindicator/indicator-object.h"
+#include "libayatana-indicator/indicator.h"
+#include "libayatana-indicator/indicator-object.h"
 
 G_BEGIN_DECLS
 
diff --git a/tests/dummy-indicator-null.c b/tests/dummy-indicator-null.c
index 8aec668..5eb8716 100644
--- a/tests/dummy-indicator-null.c
+++ b/tests/dummy-indicator-null.c
@@ -24,8 +24,8 @@ License along with this library. If not, see
 #include <glib.h>
 #include <glib-object.h>
 
-#include "libindicator/indicator.h"
-#include "libindicator/indicator-object.h"
+#include "libayatana-indicator/indicator.h"
+#include "libayatana-indicator/indicator-object.h"
 
 #define DUMMY_INDICATOR_NULL_TYPE            (dummy_indicator_null_get_type ())
 #define DUMMY_INDICATOR_NULL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), DUMMY_INDICATOR_NULL_TYPE, DummyIndicatorNull))
diff --git a/tests/dummy-indicator-signaler.c b/tests/dummy-indicator-signaler.c
index a4206d0..f73f35e 100644
--- a/tests/dummy-indicator-signaler.c
+++ b/tests/dummy-indicator-signaler.c
@@ -23,8 +23,8 @@ License along with this library. If not, see
 #include <glib.h>
 #include <glib-object.h>
 
-#include "libindicator/indicator.h"
-#include "libindicator/indicator-object.h"
+#include "libayatana-indicator/indicator.h"
+#include "libayatana-indicator/indicator-object.h"
 
 #define DUMMY_INDICATOR_SIGNALER_TYPE            (dummy_indicator_signaler_get_type ())
 #define DUMMY_INDICATOR_SIGNALER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), DUMMY_INDICATOR_SIGNALER_TYPE, DummyIndicatorSignaler))
diff --git a/tests/dummy-indicator-simple.c b/tests/dummy-indicator-simple.c
index 1aab711..69a9c1d 100644
--- a/tests/dummy-indicator-simple.c
+++ b/tests/dummy-indicator-simple.c
@@ -23,8 +23,8 @@ License along with this library. If not, see
 #include <glib.h>
 #include <glib-object.h>
 
-#include "libindicator/indicator.h"
-#include "libindicator/indicator-object.h"
+#include "libayatana-indicator/indicator.h"
+#include "libayatana-indicator/indicator-object.h"
 
 #define DUMMY_INDICATOR_SIMPLE_TYPE            (dummy_indicator_simple_get_type ())
 #define DUMMY_INDICATOR_SIMPLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), DUMMY_INDICATOR_SIMPLE_TYPE, DummyIndicatorSimple))
diff --git a/tests/dummy-indicator-visible.c b/tests/dummy-indicator-visible.c
index 42cb59c..05bc9ad 100644
--- a/tests/dummy-indicator-visible.c
+++ b/tests/dummy-indicator-visible.c
@@ -23,8 +23,8 @@ License along with this library. If not, see
 #include <glib.h>
 #include <glib-object.h>
 
-#include "libindicator/indicator.h"
-#include "libindicator/indicator-object.h"
+#include "libayatana-indicator/indicator.h"
+#include "libayatana-indicator/indicator-object.h"
 
 #define DUMMY_INDICATOR_VISIBLE_TYPE            (dummy_indicator_visible_get_type ())
 #define DUMMY_INDICATOR_VISIBLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), DUMMY_INDICATOR_VISIBLE_TYPE, DummyIndicatorVisible))
diff --git a/tests/indicator-test-service.c b/tests/indicator-test-service.c
index a40945f..2aa973e 100644
--- a/tests/indicator-test-service.c
+++ b/tests/indicator-test-service.c
@@ -19,7 +19,7 @@ bus_acquired (GDBusConnection *connection,
   GError *error = NULL;
 
   indicator->actions_export_id = g_dbus_connection_export_action_group (connection,
-                                                                        "/com/canonical/indicator/test",
+                                                                        "/org/ayatana/indicator/test",
                                                                         G_ACTION_GROUP (indicator->actions),
                                                                         &error);
   if (indicator->actions_export_id == 0)
@@ -30,7 +30,7 @@ bus_acquired (GDBusConnection *connection,
     }
 
   indicator->menu_export_id = g_dbus_connection_export_menu_model (connection,
-                                                                   "/com/canonical/indicator/test/desktop",
+                                                                   "/org/ayatana/indicator/test/desktop",
                                                                    G_MENU_MODEL (indicator->menu),
                                                                    &error);
   if (indicator->menu_export_id == 0)
@@ -83,13 +83,13 @@ main (int argc, char **argv)
   submenu = g_menu_new ();
   g_menu_append (submenu, "Show", "indicator.show");
   item = g_menu_item_new (NULL, "indicator._header");
-  g_menu_item_set_attribute (item, "x-canonical-type", "s", "com.canonical.indicator.root");
+  g_menu_item_set_attribute (item, "x-canonical-type", "s", "org.ayatana.indicator.root");
   g_menu_item_set_submenu (item, G_MENU_MODEL (submenu));
   indicator.menu = g_menu_new ();
   g_menu_append_item (indicator.menu, item);
 
   g_bus_own_name (G_BUS_TYPE_SESSION,
-                  "com.canonical.indicator.test",
+                  "org.ayatana.indicator.test",
                   G_BUS_NAME_OWNER_FLAGS_NONE,
                   bus_acquired,
                   NULL,
diff --git a/tests/org.ayatana.indicator.no-such-service b/tests/org.ayatana.indicator.no-such-service
new file mode 100644
index 0000000..d6b0aef
--- /dev/null
+++ b/tests/org.ayatana.indicator.no-such-service
@@ -0,0 +1,3 @@
+[Indicator Service]
+Name=indicator-test
+ObjectPath=/org/ayatana/indicator/test
diff --git a/tests/org.ayatana.indicator.test b/tests/org.ayatana.indicator.test
new file mode 100644
index 0000000..f2ba7d9
--- /dev/null
+++ b/tests/org.ayatana.indicator.test
@@ -0,0 +1,6 @@
+[Indicator Service]
+Name=indicator-test
+ObjectPath=/org/ayatana/indicator/test
+
+[desktop]
+ObjectPath=/org/ayatana/indicator/test/desktop
diff --git a/tests/com.canonical.indicator.test.service.in b/tests/org.ayatana.indicator.test.service.in
index 3fdbe76..bf8ec46 100644
--- a/tests/com.canonical.indicator.test.service.in
+++ b/tests/org.ayatana.indicator.test.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=com.canonical.indicator.test
+Name=org.ayatana.indicator.test
 Exec=@builddir@/indicator-test-service
diff --git a/tests/test-indicator-ng.c b/tests/test-indicator-ng.c
index 296e00b..4e38c6e 100644
--- a/tests/test-indicator-ng.c
+++ b/tests/test-indicator-ng.c
@@ -36,7 +36,7 @@ test_non_existing (void)
   IndicatorNg *indicator;
   GError *error = NULL;
 
-  indicator = indicator_ng_new (SRCDIR "/com.canonical.does.not.exist.indicator", &error);
+  indicator = indicator_ng_new (SRCDIR "/org.ayatana.does.not.exist.indicator", &error);
   g_assert (indicator == NULL);
   g_assert_error (error, G_FILE_ERROR, G_FILE_ERROR_NOENT);
 
@@ -50,11 +50,11 @@ test_instantiation (void)
   GError *error = NULL;
   GMainLoop *loop;
 
-  indicator = indicator_ng_new (SRCDIR "/com.canonical.indicator.no-such-service", &error);
+  indicator = indicator_ng_new (SRCDIR "/org.ayatana.indicator.no-such-service", &error);
   g_assert (indicator);
   g_assert (error == NULL);
 
-  g_assert_cmpstr (indicator_ng_get_service_file (indicator), ==, SRCDIR "/com.canonical.indicator.no-such-service");
+  g_assert_cmpstr (indicator_ng_get_service_file (indicator), ==, SRCDIR "/org.ayatana.indicator.no-such-service");
   g_assert_cmpstr (indicator_ng_get_profile (indicator), ==, "desktop");
 
   {
@@ -65,7 +65,7 @@ test_instantiation (void)
                              "profile", &profile,
                              NULL);
 
-    g_assert_cmpstr (service_file, ==, SRCDIR "/com.canonical.indicator.no-such-service");
+    g_assert_cmpstr (service_file, ==, SRCDIR "/org.ayatana.indicator.no-such-service");
     g_assert_cmpstr (profile, ==, "desktop");
 
     g_free (service_file);
@@ -89,7 +89,7 @@ test_instantiation_with_profile (void)
   IndicatorNg *indicator;
   GError *error = NULL;
 
-  indicator = indicator_ng_new_for_profile (SRCDIR "/com.canonical.indicator.test", "greeter", &error);
+  indicator = indicator_ng_new_for_profile (SRCDIR "/org.ayatana.indicator.test", "greeter", &error);
   g_assert (indicator);
   g_assert (error == NULL);
 
@@ -133,7 +133,7 @@ test_menu (void)
   GList *entries;
   IndicatorObjectEntry *entry;
 
-  indicator = indicator_ng_new (SRCDIR "/com.canonical.indicator.test", &error);
+  indicator = indicator_ng_new (SRCDIR "/org.ayatana.indicator.test", &error);
   g_assert (indicator);
   g_assert (error == NULL);
 
diff --git a/tests/test-loader.c b/tests/test-loader.c
index 28187ad..5f9b8d3 100644
--- a/tests/test-loader.c
+++ b/tests/test-loader.c
@@ -21,7 +21,7 @@ License along with this library. If not, see
 */
 
 #include <gtk/gtk.h>
-#include "libindicator/indicator-object.h"
+#include "libayatana-indicator/indicator-object.h"
 
 #include "dummy-indicator-entry-func.h"
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 8df5445..4aa3cfc 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,6 +1,6 @@
 if USE_GTK3
-INDICATOR_LIB = -lindicator3
-libexec_PROGRAMS = indicator-loader3
+INDICATOR_LIB = -layatana-indicator3
+libexec_PROGRAMS = ayatana-indicator-loader3
 VER=3
 endif
 
@@ -9,29 +9,31 @@ endif
 # Indicator Loader
 #############################
 
-indicator_loader_SOURCES = \
+ayatana_indicator_loader_SOURCES = \
 	indicator-loader.c
 
-indicator_loader_CFLAGS = \
+ayatana_indicator_loader_CFLAGS = \
 	-Wall -Werror \
 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \
 	-DBUILD_DIR="\"$(builddir)\""
 
-indicator_loader_LDADD = \
+ayatana_indicator_loader_LDADD = \
 	$(LIBINDICATOR_LIBS) \
-	-L$(top_builddir)/libindicator/.libs \
+	-L$(top_builddir)/libayatana-indicator/.libs \
 	$(INDICATOR_LIB)
 
 # We duplicate these here because Automake won't let us use $(VER) on the left hand side.
 # Since we carefully use $(VER) in the right hand side above, we can assign the same values.
 # Only one version of the library is every compiled at the same time, so it is safe to reuse
 # the right hand sides like this.
-indicator_loader3_SOURCES = $(indicator_loader_SOURCES)
-indicator_loader3_CFLAGS = $(indicator_loader_CFLAGS)
-indicator_loader3_LDADD = $(indicator_loader_LDADD)
+ayatana_indicator_loader3_SOURCES = $(ayatana_indicator_loader_SOURCES)
+ayatana_indicator_loader3_CFLAGS = $(ayatana_indicator_loader_CFLAGS)
+ayatana_indicator_loader3_LDADD = $(ayatana_indicator_loader_LDADD)
 
 xsessiondir = $(pkgdatadir)
 
 xsession_DATA = 80indicator-debugging
 
 EXTRA_DIST = $(xsession_DATA)
+
+DISTCLEANFILES = Makefile.in
diff --git a/tools/indicator-loader.c b/tools/indicator-loader.c
index a734b8a..7c30a59 100644
--- a/tools/indicator-loader.c
+++ b/tools/indicator-loader.c
@@ -24,10 +24,10 @@
  */
 
 #include <gtk/gtk.h>
-#include <libido/libido.h>
-#include <libindicator/indicator-object.h>
+#include <libayatana-ido/libayatana-ido.h>
+#include <libayatana-indicator/indicator-object.h>
 #if GTK_CHECK_VERSION (3,0,0)
- #include <libindicator/indicator-ng.h>
+ #include <libayatana-indicator/indicator-ng.h>
 #endif
 
 static GHashTable * entry_to_menu_item = NULL;