From d1d65249d12ca309a3df7fac7614b866372b072f Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Tue, 18 Jun 2013 01:05:53 -0500
Subject: rename the indicator bus file as 'com.canonical.indicator.datetime';
 add it to data/Makefile

---
 configure.ac                          | 18 ----------
 data/Makefile.am                      | 63 ++++++++++++++++++++---------------
 data/com.canonical.indicator.datetime |  9 +++++
 data/datetime.indicator               |  9 -----
 4 files changed, 46 insertions(+), 53 deletions(-)
 create mode 100644 data/com.canonical.indicator.datetime
 delete mode 100644 data/datetime.indicator

diff --git a/configure.ac b/configure.ac
index 22a6ee5..315facd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -115,23 +115,6 @@ AC_SUBST(COVERAGE_LDFLAGS)
 with_localinstall="no"
 AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install all of the files localy instead of system directories (for distcheck)]), with_localinstall=$enableval, with_localinstall=no)
 
-###########################
-# Indicator Info
-###########################
-
-AS_IF([test "x$with_localinstall" = "xyes"],
-	[
-	INDICATORDIR="${libdir}/indicators/2/"
-	INDICATORICONSDIR="${datadir}/libindicate/icons/"
-	],
-	[
-	INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4`
-	INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3-0.4`
-	])
-
-AC_SUBST(INDICATORDIR)
-AC_SUBST(INDICATORICONSDIR)
-
 ###########################
 # Control Center Info
 ###########################
@@ -229,7 +212,6 @@ AC_MSG_NOTICE([
 Date and Time Indicator Configuration:
 
 	Prefix:        $prefix
-	Indicator Dir: $INDICATORDIR
 	CC Panel:      $have_ccpanel
 	CC Panel Dir:  $CCPANELDIR
 	Unit Tests:    $enable_tests
diff --git a/data/Makefile.am b/data/Makefile.am
index 6d4dd72..e0019e6 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,34 +1,45 @@
-#SUBDIRS = icons
+BUILT_SOURCES=
+CLEANFILES=
+EXTRA_DIST=
 
-gsettings_SCHEMAS = \
-	com.canonical.indicator.datetime.gschema.xml
-@GSETTINGS_RULES@
+#
+# the indicator bus file
+#
 
-dbus_servicesdir = $(DBUSSERVICEDIR)
-dbus_services_DATA = indicator-datetime.service
+indicatorsdir = $(prefix)/share/unity/indicators
+indicators_DATA = com.canonical.indicator.datetime
 
-%.service: %.service.in
-	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+#
+# the gsettings
+#
 
-EXTRA_DIST = \
-	$(gsettings_SCHEMAS) \
-	indicator-datetime.service.in
+gsettings_SCHEMAS = com.canonical.indicator.datetime.gschema.xml
+@GSETTINGS_RULES@
+EXTRA_DIST += $(gsettings_SCHEMAS)
 
-CLEANFILES = indicator-datetime.service
+#
+# the dbus service file
+#
 
+dbus_servicesdir = $(DBUSSERVICEDIR)
+dbus_services_DATA = indicator-datetime.service
+dbus_services_in = $(dbus_services_DATA:.service=.service.in)
+$(dbus_services_DATA): $(dbus_services_in)
+	$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+BUILT_SOURCES += $(dbus_services_DATA)
+CLEANFILES += $(dbus_services_DATA)
+EXTRA_DIST += $(dbus_services_in)
+
+#
+# the gnome-control-center panel
+#
+
+EXTRA_DIST += datetime-dialog.ui
 if BUILD_CCPANEL
-pkgdata_DATA = datetime-dialog.ui
-
-@INTLTOOL_DESKTOP_RULE@
-desktopdir = $(datadir)/applications
-desktop_DATA = indicator-datetime-preferences.desktop
-
-EXTRA_DIST += \
-	indicator-datetime-preferences.desktop
-
-CLEANFILES += indicator-datetime-preferences.desktop
+ pkgdata_DATA = datetime-dialog.ui
+ @INTLTOOL_DESKTOP_RULE@
+ desktopdir = $(datadir)/applications
+ desktop_DATA = indicator-datetime-preferences.desktop
+ EXTRA_DIST += $(desktop_DATA) $(desktop_DATA:.desktop=.desktop.in)
+ CLEANFILES += $(desktop_DATA)
 endif
-
-EXTRA_DIST += \
-	datetime-dialog.ui \
-	indicator-datetime-preferences.desktop.in
diff --git a/data/com.canonical.indicator.datetime b/data/com.canonical.indicator.datetime
new file mode 100644
index 0000000..055ea8e
--- /dev/null
+++ b/data/com.canonical.indicator.datetime
@@ -0,0 +1,9 @@
+[Indicator Service]
+Name=indicator-datetime
+ObjectPath=/com/canonical/indicator/datetime
+
+[desktop]
+ObjectPath=/com/canonical/indicator/datetime/desktop
+
+[greeter]
+ObjectPath=/com/canonical/indicator/datetime/greeter
diff --git a/data/datetime.indicator b/data/datetime.indicator
deleted file mode 100644
index 055ea8e..0000000
--- a/data/datetime.indicator
+++ /dev/null
@@ -1,9 +0,0 @@
-[Indicator Service]
-Name=indicator-datetime
-ObjectPath=/com/canonical/indicator/datetime
-
-[desktop]
-ObjectPath=/com/canonical/indicator/datetime/desktop
-
-[greeter]
-ObjectPath=/com/canonical/indicator/datetime/greeter
-- 
cgit v1.2.3