From 796a887cf88c1ad23ab06e89435ca1e04080aaee Mon Sep 17 00:00:00 2001 From: Pete Woods 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 Date: Fri, 16 Aug 2013 04:58:55 +0100 Subject: Clean up the build / installation --- .bzrignore | 26 -------------------------- config.h.in | 25 +++++++++++++++++++++++++ data/indicator-sound.service.in | 2 +- debian/control | 2 +- debian/rules | 9 +-------- src/CMakeLists.txt | 2 +- 6 files changed, 29 insertions(+), 37 deletions(-) create mode 100644 config.h.in (limited to 'data') 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 . + * + * Author: Pete Woods + */ + +#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 XSBC-Original-Maintainer: Conor Curran 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/ ) -- cgit v1.2.3