1 files changed, 36 insertions, 25 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 91a49d7..3180cbe 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
-
-CLEANFILES = indicator-datetime.service
+gsettings_SCHEMAS = com.canonical.indicator.datetime.gschema.xml
+@GSETTINGS_RULES@
+EXTRA_DIST += $(gsettings_SCHEMAS)
 
-if BUILD_CCPANEL
-pkgdata_DATA = datetime-dialog.ui
+#
+# the dbus service file
+#
 
-@INTLTOOL_DESKTOP_RULE@
-desktopdir = $(datadir)/applications
-desktop_DATA = gnome-indicator-datetime-panel.desktop
+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)
 
-EXTRA_DIST += \
-	gnome-indicator-datetime-panel.desktop
+#
+# the gnome-control-center panel
+#
 
-CLEANFILES += gnome-indicator-datetime-panel.desktop
+if BUILD_CCPANEL
+ pkgdata_DATA = datetime-dialog.ui
+ @INTLTOOL_DESKTOP_RULE@
+ desktopdir = $(datadir)/applications
+ desktop_DATA = gnome-indicator-datetime-panel.desktop
+ EXTRA_DIST += $(desktop_DATA)
+ CLEANFILES += $(desktop_DATA)
 endif
-
-EXTRA_DIST += \
-	datetime-dialog.ui \
-	gnome-indicator-datetime-panel.desktop.in
+EXTRA_DIST += $(desktop_DATA:.desktop=.desktop.in)