Clean up the build / installation

6 files changed, 29 insertions, 37 deletions

diff --git a/.bzrignore b/.bzrignore
index 96aa111..150b72b 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1,29 +1,3 @@
-Makefile
-Makefile.in
-Makefile.in.in
-.deps
-.libs
-*.gschema.valid
-
-/INSTALL
-/aclocal.m4
-/autom4te.cache
-/compile
-/config.guess
-/config.h
-/config.h.in
-/config.log
-/config.status
-/config.sub
-/configure
-/depcomp
-/install-sh
-/libtool
-/ltmain.sh
-/missing
-/stamp-h1
-/m4/*
-
 /po/POTFILES
 /po/stamp-it
 
diff --git a/config.h.in b/config.h.in
new file mode 100644
index 0000000..af72a99
--- /dev/null
+++ b/config.h.in
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <pete.woods@canonical.com>
+ */
+
+#ifndef INDICATOR_SOUND_CONFIG_H_
+#define INDICATOR_SOUND_CONFIG_H_
+
+#define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
+#define GNOMELOCALEDIR "@GNOMELOCALEDIR@"
+
+#endif // INDICATOR_SOUND_CONFIG_H_
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
diff --git a/debian/control b/debian/control
index 64ae720..2c263a3 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
 XSBC-Original-Maintainer: Conor Curran <conor.curran@canonical.com>
 Build-Depends: debhelper (>= 9.0),
-               dh-autoreconf,
+               cmake,
                dh-translations,
                gnome-common,
                autotools-dev,
diff --git a/debian/rules b/debian/rules
index 2ce3519..9a276dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,12 +3,5 @@
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
 %:
-	dh $@ --with translations,autoreconf
+	dh $@ --parallel --fail-missing --with translations
 
-override_dh_autoreconf:
-	NOCONFIGURE=1 dh_autoreconf ./autogen.sh
-
-override_dh_install:
-	find debian/indicator-sound/usr/lib -name *.la -delete
-	find debian/indicator-sound/usr/lib -name *.a -delete
-	dh_install --fail-missing
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 21931b9..ec43b8f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -123,6 +123,6 @@ target_link_libraries(
 
 install(
   TARGETS indicator-sound-service-bin
-  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}
+  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/indicator-sound/
 )