From 796a887cf88c1ad23ab06e89435ca1e04080aaee Mon Sep 17 00:00:00 2001
From: Pete Woods <pete.woods@canonical.com>
Date: Fri, 16 Aug 2013 04:13:41 +0100
Subject: Build using cmake

---
 data/CMakeLists.txt             | 43 +++++++++++++++++++++++++++++++++++++++++
 data/Makefile.am                | 20 -------------------
 data/indicator-sound.service.in |  2 +-
 3 files changed, 44 insertions(+), 21 deletions(-)
 create mode 100644 data/CMakeLists.txt
 delete mode 100644 data/Makefile.am

(limited to 'data')

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
new file mode 100644
index 0000000..c66ca69
--- /dev/null
+++ b/data/CMakeLists.txt
@@ -0,0 +1,43 @@
+
+include(UseGSettings)
+
+###########################
+# Indicator service
+###########################
+
+set(
+  INDICATOR_DIR
+  "${CMAKE_INSTALL_DATADIR}/unity/indicators"
+  CACHE FILEPATH "Indicator directory"
+)
+
+install(
+  FILES "com.canonical.indicator.sound"
+  DESTINATION "${INDICATOR_DIR}"
+)
+
+###########################
+# Dbus Service
+###########################
+
+set(
+  INDICATOR_SOUND_SERVICE
+  "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound.service"
+)
+
+configure_file(
+  "indicator-sound.service.in"
+  ${INDICATOR_SOUND_SERVICE}
+  @ONLY
+)
+
+install(
+  FILES "${INDICATOR_SOUND_SERVICE}"
+  DESTINATION "${CMAKE_INSTALL_DATADIR}/dbus-1/services/"
+)
+
+###########################
+# GSettings
+###########################
+
+add_schema ("com.canonical.indicator.sound.gschema.xml")
diff --git a/data/Makefile.am b/data/Makefile.am
deleted file mode 100644
index 7647d73..0000000
--- a/data/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-gsettings_SCHEMAS = \
-  com.canonical.indicator.sound.gschema.xml
-@GSETTINGS_RULES@
-
-dbus_servicesdir = $(datadir)/dbus-1/services
-dbus_services_DATA = indicator-sound.service
-
-%.service: %.service.in
-	sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
-
-indicatordir = $(INDICATOR_DIR)
-dist_indicator_DATA = com.canonical.indicator.sound
-
-EXTRA_DIST = \
-  $(gsettings_SCHEMAS) \
-  indicator-sound.service.in
-
-CLEANFILES = \
-  $(dbus_services_DATA)
-  
diff --git a/data/indicator-sound.service.in b/data/indicator-sound.service.in
index e8b77c6..a13e6b9 100644
--- a/data/indicator-sound.service.in
+++ b/data/indicator-sound.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=com.canonical.indicator.sound
-Exec=@pkglibexecdir@/indicator-sound-service
+Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound-service
-- 
cgit v1.2.3


From 0660fc4e9439b99ac3b75d656b2e60b629e3e745 Mon Sep 17 00:00:00 2001
From: Pete Woods <pete.woods@canonical.com>
Date: Fri, 16 Aug 2013 04:58:55 +0100
Subject: Clean up the build / installation

---
 data/indicator-sound.service.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'data')

diff --git a/data/indicator-sound.service.in b/data/indicator-sound.service.in
index a13e6b9..34309b2 100644
--- a/data/indicator-sound.service.in
+++ b/data/indicator-sound.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=com.canonical.indicator.sound
-Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound-service
+Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service
-- 
cgit v1.2.3