From f749725dd5609b98465582496c116eaad28ee696 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Wed, 19 Jun 2013 12:28:46 -0400 Subject: Install icons in $(datadir) --- data/icons/16x16/status/Makefile.am | 2 +- data/icons/scalable/status/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/icons/16x16/status/Makefile.am b/data/icons/16x16/status/Makefile.am index 79da679..9adebfa 100644 --- a/data/icons/16x16/status/Makefile.am +++ b/data/icons/16x16/status/Makefile.am @@ -1,5 +1,5 @@ -iconsdir = $(INDICATORICONSDIR)/hicolor/16x16/status +iconsdir = $(datadir)/hicolor/16x16/status icons_DATA = \ sound-icon.png diff --git a/data/icons/scalable/status/Makefile.am b/data/icons/scalable/status/Makefile.am index 4b3b974..cba60fa 100644 --- a/data/icons/scalable/status/Makefile.am +++ b/data/icons/scalable/status/Makefile.am @@ -1,5 +1,5 @@ -iconsdir = $(INDICATORICONSDIR)/hicolor/scalable/status +iconsdir = $(datadir)/hicolor/scalable/status icons_DATA = \ sound-icon.svg -- cgit v1.2.3 From 356fd4ed9c9d394a8e4128accc93628df1b931d8 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Wed, 19 Jun 2013 14:58:12 -0400 Subject: Install indicator file --- configure.ac | 6 ++++++ data/Makefile.am | 5 ++++- data/com.canonical.indicator.sound | 6 ++++++ src/com.canonical.indicator.sound | 6 ------ 4 files changed, 16 insertions(+), 7 deletions(-) create mode 100644 data/com.canonical.indicator.sound delete mode 100644 src/com.canonical.indicator.sound (limited to 'data') diff --git a/configure.ac b/configure.ac index d5713a4..71fb4aa 100644 --- a/configure.ac +++ b/configure.ac @@ -71,6 +71,12 @@ else fi AC_SUBST(DBUSSERVICEDIR) +AC_ARG_WITH([indicator-dir], + [AS_HELP_STRING([--with-indicator-dir=DIR], [Indicator directory [default=$datadir/unity/indicators]])], + [], + [with_indicator_dir=$datadir/unity/indicators]) +AC_SUBST([INDICATOR_DIR], [$with_indicator_dir]) + ############################## # Custom Junk ############################## diff --git a/data/Makefile.am b/data/Makefile.am index 2891606..243662c 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -10,10 +10,13 @@ dbus_services_DATA = indicator-sound.service %.service: %.service.in sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ +indicatordir = $(INDICATOR_DIR) +dist_indicator_DATA = com.canonical.indicator.sound + EXTRA_DIST = \ $(gsettings_SCHEMAS) \ indicator-sound.service.in CLEANFILES = \ $(dbus_services_DATA) - \ No newline at end of file + diff --git a/data/com.canonical.indicator.sound b/data/com.canonical.indicator.sound new file mode 100644 index 0000000..825fd30 --- /dev/null +++ b/data/com.canonical.indicator.sound @@ -0,0 +1,6 @@ +[Indicator Service] +Name=indicator-sound +ObjectPath=/com/canonical/indicator/sound + +[desktop] +ObjectPath=/com/canonical/indicator/sound/desktop diff --git a/src/com.canonical.indicator.sound b/src/com.canonical.indicator.sound deleted file mode 100644 index 825fd30..0000000 --- a/src/com.canonical.indicator.sound +++ /dev/null @@ -1,6 +0,0 @@ -[Indicator Service] -Name=indicator-sound -ObjectPath=/com/canonical/indicator/sound - -[desktop] -ObjectPath=/com/canonical/indicator/sound/desktop -- cgit v1.2.3 From bb23395d4a7b5889c91b3708e46c75623fe7f2a9 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Wed, 19 Jun 2013 15:17:00 -0400 Subject: Remove icon The single icon that was in this package was not used anywhere. --- configure.ac | 5 -- data/Makefile.am | 2 - data/icons/16x16/Makefile.am | 1 - data/icons/16x16/status/Makefile.am | 8 --- data/icons/16x16/status/sound-icon.png | Bin 616 -> 0 bytes data/icons/Makefile.am | 15 ----- data/icons/scalable/Makefile.am | 1 - data/icons/scalable/status/Makefile.am | 8 --- data/icons/scalable/status/sound-icon.svg | 102 ------------------------------ 9 files changed, 142 deletions(-) delete mode 100644 data/icons/16x16/Makefile.am delete mode 100644 data/icons/16x16/status/Makefile.am delete mode 100644 data/icons/16x16/status/sound-icon.png delete mode 100644 data/icons/Makefile.am delete mode 100644 data/icons/scalable/Makefile.am delete mode 100644 data/icons/scalable/status/Makefile.am delete mode 100644 data/icons/scalable/status/sound-icon.svg (limited to 'data') diff --git a/configure.ac b/configure.ac index 71fb4aa..706b998 100644 --- a/configure.ac +++ b/configure.ac @@ -112,11 +112,6 @@ AC_OUTPUT([ Makefile src/Makefile data/Makefile -data/icons/Makefile -data/icons/16x16/Makefile -data/icons/16x16/status/Makefile -data/icons/scalable/Makefile -data/icons/scalable/status/Makefile po/Makefile.in tests/Makefile ]) diff --git a/data/Makefile.am b/data/Makefile.am index 243662c..a64dff4 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,5 +1,3 @@ -SUBDIRS = icons - gsettings_SCHEMAS = \ com.canonical.indicator.sound.gschema.xml @GSETTINGS_RULES@ diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am deleted file mode 100644 index d52da2b..0000000 --- a/data/icons/16x16/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = status diff --git a/data/icons/16x16/status/Makefile.am b/data/icons/16x16/status/Makefile.am deleted file mode 100644 index 9adebfa..0000000 --- a/data/icons/16x16/status/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ - -iconsdir = $(datadir)/hicolor/16x16/status - -icons_DATA = \ - sound-icon.png - -EXTRA_DIST = $(icons_DATA) - diff --git a/data/icons/16x16/status/sound-icon.png b/data/icons/16x16/status/sound-icon.png deleted file mode 100644 index 992c6bd..0000000 Binary files a/data/icons/16x16/status/sound-icon.png and /dev/null differ diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am deleted file mode 100644 index b671b5c..0000000 --- a/data/icons/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -SUBDIRS = scalable 16x16 - -gtk_update_icon_cache = gtk-update-icon-cache -f -t $(pkgdatadir)/icons/hicolor - -install-data-hook: update-icon-cache -uninstall-hook: update-icon-cache -update-icon-cache: - @-if test -z "$(DESTDIR)"; then \ - echo "Updating Gtk icon cache."; \ - $(gtk_update_icon_cache); \ - else \ - echo "*** Icon cache not updated. After (un)install, run this:"; \ - echo "*** $(gtk_update_icon_cache)"; \ - fi - diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am deleted file mode 100644 index d52da2b..0000000 --- a/data/icons/scalable/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = status diff --git a/data/icons/scalable/status/Makefile.am b/data/icons/scalable/status/Makefile.am deleted file mode 100644 index cba60fa..0000000 --- a/data/icons/scalable/status/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ - -iconsdir = $(datadir)/hicolor/scalable/status - -icons_DATA = \ - sound-icon.svg - -EXTRA_DIST = $(icons_DATA) - diff --git a/data/icons/scalable/status/sound-icon.svg b/data/icons/scalable/status/sound-icon.svg deleted file mode 100644 index a94bb48..0000000 --- a/data/icons/scalable/status/sound-icon.svg +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3 From 0ef34d217850fcf160e1045dbd4a0be412e5087e Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Thu, 4 Jul 2013 16:00:09 -0400 Subject: Remove --enable-localinstall Always put dbus service file into $(datadir)/dbus-1/services --- Makefile.am | 2 -- configure.ac | 14 -------------- data/Makefile.am | 2 +- 3 files changed, 1 insertion(+), 17 deletions(-) (limited to 'data') diff --git a/Makefile.am b/Makefile.am index 3ba6110..3544dc4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,6 +9,4 @@ EXTRA_DIST = \ autogen.sh \ vapi/config.vapi -DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall - include $(top_srcdir)/Makefile.am.coverage diff --git a/configure.ac b/configure.ac index 706b998..5c0be0f 100644 --- a/configure.ac +++ b/configure.ac @@ -47,13 +47,6 @@ AC_SUBST(COVERAGE_CFLAGS) AC_SUBST(COVERAGE_CXXFLAGS) AC_SUBST(COVERAGE_LDFLAGS) -########################### -# Check to see if we're local -########################### - -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) - ########################### # Grab the GSettings Macros ########################### @@ -64,13 +57,6 @@ GLIB_GSETTINGS # DBus Service Info ########################### -if test "x$with_localinstall" = "xyes"; then - DBUSSERVICEDIR="${datadir}/dbus-1/services/" -else - DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1` -fi -AC_SUBST(DBUSSERVICEDIR) - AC_ARG_WITH([indicator-dir], [AS_HELP_STRING([--with-indicator-dir=DIR], [Indicator directory [default=$datadir/unity/indicators]])], [], diff --git a/data/Makefile.am b/data/Makefile.am index a64dff4..5160dd9 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -2,7 +2,7 @@ gsettings_SCHEMAS = \ com.canonical.indicator.sound.gschema.xml @GSETTINGS_RULES@ -dbus_servicesdir = $(DBUSSERVICEDIR) +dbus_servicesdir = $(datadir)/dbus-1/services dbus_services_DATA = indicator-sound.service %.service: %.service.in -- cgit v1.2.3 From c0c0bd01a0a0b74cef1a13a2ec36068f613fc851 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Thu, 4 Jul 2013 16:02:34 -0400 Subject: indicator file: add position --- data/com.canonical.indicator.sound | 1 + 1 file changed, 1 insertion(+) (limited to 'data') diff --git a/data/com.canonical.indicator.sound b/data/com.canonical.indicator.sound index 825fd30..0831462 100644 --- a/data/com.canonical.indicator.sound +++ b/data/com.canonical.indicator.sound @@ -1,6 +1,7 @@ [Indicator Service] Name=indicator-sound ObjectPath=/com/canonical/indicator/sound +Position=30 [desktop] ObjectPath=/com/canonical/indicator/sound/desktop -- cgit v1.2.3 From 7ca667494e32d110766c2b4a013b6a2c37b8a084 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Thu, 4 Jul 2013 16:09:09 -0400 Subject: Put service into $pkglibexecdir --- data/Makefile.am | 2 +- data/indicator-sound.service.in | 2 +- src/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index 5160dd9..7647d73 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -6,7 +6,7 @@ dbus_servicesdir = $(datadir)/dbus-1/services dbus_services_DATA = indicator-sound.service %.service: %.service.in - sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ + sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ indicatordir = $(INDICATOR_DIR) dist_indicator_DATA = com.canonical.indicator.sound diff --git a/data/indicator-sound.service.in b/data/indicator-sound.service.in index 4cee062..e8b77c6 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=@libexecdir@/indicator-sound-service +Exec=@pkglibexecdir@/indicator-sound-service diff --git a/src/Makefile.am b/src/Makefile.am index 5958b51..da3df5b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -libexec_PROGRAMS = indicator-sound-service +pkglibexec_PROGRAMS = indicator-sound-service indicator_sound_service_SOURCES = \ service.vala \ -- cgit v1.2.3