aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2013-06-18 01:05:53 -0500
committerCharles Kerr <charles.kerr@canonical.com>2013-06-18 01:05:53 -0500
commitd1d65249d12ca309a3df7fac7614b866372b072f (patch)
tree50d650a489e3bb66f8f490b452d56f8149f63302
parent1d015b51af186c0f71ff8164321feeef1cf63c19 (diff)
downloadayatana-indicator-datetime-d1d65249d12ca309a3df7fac7614b866372b072f.tar.gz
ayatana-indicator-datetime-d1d65249d12ca309a3df7fac7614b866372b072f.tar.bz2
ayatana-indicator-datetime-d1d65249d12ca309a3df7fac7614b866372b072f.zip
rename the indicator bus file as 'com.canonical.indicator.datetime'; add it to data/Makefile
-rw-r--r--configure.ac18
-rw-r--r--data/Makefile.am63
-rw-r--r--data/com.canonical.indicator.datetime (renamed from data/datetime.indicator)0
3 files changed, 37 insertions, 44 deletions
diff --git a/configure.ac b/configure.ac
index 22a6ee5..315facd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -116,23 +116,6 @@ 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/datetime.indicator b/data/com.canonical.indicator.datetime
index 055ea8e..055ea8e 100644
--- a/data/datetime.indicator
+++ b/data/com.canonical.indicator.datetime