From 452ac8d007d55ef282546c0ee3871bf50dd49917 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 20 Jun 2013 18:06:06 -0500 Subject: add cmake rules to install the icon files --- data/CMakeLists.txt | 15 +++++++++++++++ data/Makefile.am | 27 --------------------------- data/icons/16x16/Makefile.am | 1 - data/icons/16x16/actions/Makefile.am | 9 --------- data/icons/16x16/status/Makefile.am | 7 ------- data/icons/22x22/Makefile.am | 1 - data/icons/22x22/actions/Makefile.am | 9 --------- data/icons/22x22/status/Makefile.am | 7 ------- data/icons/24x24/Makefile.am | 1 - data/icons/24x24/actions/Makefile.am | 9 --------- data/icons/24x24/status/Makefile.am | 7 ------- data/icons/32x32/Makefile.am | 1 - data/icons/32x32/actions/Makefile.am | 8 -------- data/icons/32x32/status/Makefile.am | 7 ------- data/icons/Makefile.am | 15 --------------- data/icons/scalable/Makefile.am | 1 - data/icons/scalable/actions/Makefile.am | 9 --------- data/icons/scalable/status/Makefile.am | 7 ------- 18 files changed, 15 insertions(+), 126 deletions(-) delete mode 100644 data/Makefile.am delete mode 100644 data/icons/16x16/Makefile.am delete mode 100644 data/icons/16x16/actions/Makefile.am delete mode 100644 data/icons/16x16/status/Makefile.am delete mode 100644 data/icons/22x22/Makefile.am delete mode 100644 data/icons/22x22/actions/Makefile.am delete mode 100644 data/icons/22x22/status/Makefile.am delete mode 100644 data/icons/24x24/Makefile.am delete mode 100644 data/icons/24x24/actions/Makefile.am delete mode 100644 data/icons/24x24/status/Makefile.am delete mode 100644 data/icons/32x32/Makefile.am delete mode 100644 data/icons/32x32/actions/Makefile.am delete mode 100644 data/icons/32x32/status/Makefile.am delete mode 100644 data/icons/Makefile.am delete mode 100644 data/icons/scalable/Makefile.am delete mode 100644 data/icons/scalable/actions/Makefile.am delete mode 100644 data/icons/scalable/status/Makefile.am (limited to 'data') diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index d8f338b..de6942d 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -40,3 +40,18 @@ set (UNITY_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/share/unity") install (FILES ${UNITY_INDICATOR_PATH} DESTINATION "${UNITY_INSTALL_PREFIX}/indicators") + +## +## Icons +## + +if(${LOCAL_INSTALL}) + set (ICON_PREFIX "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/libindicator/icons/") +else() + EXEC_PROGRAM(${PKG_CONFIG_EXECUTABLE} ARGS indicator3-0.4 --variable iconsdir OUTPUT_VARIABLE ICON_PREFIX) +endif() +set (ICON_DIR "${ICON_PREFIX}/hicolor") +message ("Installing icons to ${ICON_DIR}") +install (DIRECTORY icons + DESTINATION ${ICON_DIR} + FILES_MATCHING PATTERN "*.png" PATTERN "*.svg") diff --git a/data/Makefile.am b/data/Makefile.am deleted file mode 100644 index 27b5ea2..0000000 --- a/data/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -SUBDIRS = \ - icons \ - extra-sessions - -dbus_servicesdir = $(DBUSSERVICEDIR) -service_in_files = indicator-session.service.in -dbus_services_DATA = $(service_in_files:.service.in=.service) - -%.service: %.service.in - sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ - -@INTLTOOL_SCHEMAS_RULE@ -@INTLTOOL_XML_NOMERGE_RULE@ - -@GSETTINGS_RULES@ -gsettings_SCHEMAS = com.canonical.indicator.session.gschema.xml - -convertdir = $(datadir)/GConf/gsettings -dist_convert_DATA = indicator-session.convert - -EXTRA_DIST = \ - $(service_in_files) \ - $(gsettings_SCHEMAS:.xml=.xml.in) - -CLEANFILES = \ - $(dbus_services_DATA) \ - $(gsettings_SCHEMAS) diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am deleted file mode 100644 index c163076..0000000 --- a/data/icons/16x16/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = actions status diff --git a/data/icons/16x16/actions/Makefile.am b/data/icons/16x16/actions/Makefile.am deleted file mode 100644 index 5aa276c..0000000 --- a/data/icons/16x16/actions/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ - -iconsdir = $(INDICATORICONSDIR)/hicolor/16x16/actions - -icons_DATA = \ - system-shutdown.png \ - system-restart.png \ - system-log-out.png - -EXTRA_DIST = $(icons_DATA) diff --git a/data/icons/16x16/status/Makefile.am b/data/icons/16x16/status/Makefile.am deleted file mode 100644 index c0af60e..0000000 --- a/data/icons/16x16/status/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ - -iconsdir = $(INDICATORICONSDIR)/hicolor/16x16/status - -icons_DATA = \ - account-logged-in.png - -EXTRA_DIST = $(icons_DATA) diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am deleted file mode 100644 index c163076..0000000 --- a/data/icons/22x22/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = actions status diff --git a/data/icons/22x22/actions/Makefile.am b/data/icons/22x22/actions/Makefile.am deleted file mode 100644 index 73cdd09..0000000 --- a/data/icons/22x22/actions/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ - -iconsdir = $(INDICATORICONSDIR)/hicolor/22x22/actions - -icons_DATA = \ - system-shutdown.png \ - system-restart.png \ - system-log-out.png - -EXTRA_DIST = $(icons_DATA) diff --git a/data/icons/22x22/status/Makefile.am b/data/icons/22x22/status/Makefile.am deleted file mode 100644 index 1ce0fa1..0000000 --- a/data/icons/22x22/status/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ - -iconsdir = $(INDICATORICONSDIR)/hicolor/22x22/status - -icons_DATA = \ - account-logged-in.png - -EXTRA_DIST = $(icons_DATA) diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am deleted file mode 100644 index c163076..0000000 --- a/data/icons/24x24/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = actions status diff --git a/data/icons/24x24/actions/Makefile.am b/data/icons/24x24/actions/Makefile.am deleted file mode 100644 index 55c63d1..0000000 --- a/data/icons/24x24/actions/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ - -iconsdir = $(INDICATORICONSDIR)/hicolor/24x24/actions - -icons_DATA = \ - system-shutdown.png \ - system-restart.png \ - system-log-out.png - -EXTRA_DIST = $(icons_DATA) diff --git a/data/icons/24x24/status/Makefile.am b/data/icons/24x24/status/Makefile.am deleted file mode 100644 index 4fa065a..0000000 --- a/data/icons/24x24/status/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ - -iconsdir = $(INDICATORICONSDIR)/hicolor/24x24/status - -icons_DATA = \ - account-logged-in.png - -EXTRA_DIST = $(icons_DATA) diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am deleted file mode 100644 index c163076..0000000 --- a/data/icons/32x32/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = actions status diff --git a/data/icons/32x32/actions/Makefile.am b/data/icons/32x32/actions/Makefile.am deleted file mode 100644 index 74c2c8d..0000000 --- a/data/icons/32x32/actions/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ - -iconsdir = $(INDICATORICONSDIR)/hicolor/32x32/actions - -icons_DATA = \ - system-restart.png \ - system-log-out.png - -EXTRA_DIST = $(icons_DATA) diff --git a/data/icons/32x32/status/Makefile.am b/data/icons/32x32/status/Makefile.am deleted file mode 100644 index b852725..0000000 --- a/data/icons/32x32/status/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ - -iconsdir = $(INDICATORICONSDIR)/hicolor/32x32/status - -icons_DATA = \ - account-logged-in.png - -EXTRA_DIST = $(icons_DATA) diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am deleted file mode 100644 index 7394c73..0000000 --- a/data/icons/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -SUBDIRS = scalable 16x16 22x22 24x24 32x32 - -gtk_update_icon_cache = gtk-update-icon-cache -f -t $(INDICATORICONSDIR)/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 c163076..0000000 --- a/data/icons/scalable/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = actions status diff --git a/data/icons/scalable/actions/Makefile.am b/data/icons/scalable/actions/Makefile.am deleted file mode 100644 index 39b4177..0000000 --- a/data/icons/scalable/actions/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ - -iconsdir = $(INDICATORICONSDIR)/hicolor/scalable/actions - -icons_DATA = \ - system-restart.svg \ - system-log-out.svg \ - system-shutdown.svg - -EXTRA_DIST = $(icons_DATA) diff --git a/data/icons/scalable/status/Makefile.am b/data/icons/scalable/status/Makefile.am deleted file mode 100644 index cb006e2..0000000 --- a/data/icons/scalable/status/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ - -iconsdir = $(INDICATORICONSDIR)/hicolor/scalable/status - -icons_DATA = \ - account-logged-in.svg - -EXTRA_DIST = $(icons_DATA) -- cgit v1.2.3