aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/CMakeLists.txt38
-rw-r--r--data/Makefile.am35
-rw-r--r--data/ayatana-indicator-messages.desktop.in2
-rw-r--r--data/ayatana-indicator-messages.service.in2
-rw-r--r--data/icons/16x16/Makefile.am1
-rw-r--r--data/icons/16x16/categories/Makefile.am10
-rw-r--r--data/icons/16x16/status/Makefile.am10
-rw-r--r--data/icons/22x22/Makefile.am1
-rw-r--r--data/icons/22x22/categories/Makefile.am8
-rw-r--r--data/icons/22x22/status/Makefile.am9
-rw-r--r--data/icons/24x24/Makefile.am1
-rw-r--r--data/icons/24x24/status/Makefile.am10
-rw-r--r--data/icons/32x32/Makefile.am1
-rw-r--r--data/icons/32x32/categories/Makefile.am9
-rw-r--r--data/icons/32x32/status/Makefile.am10
-rw-r--r--data/icons/48x48/Makefile.am1
-rw-r--r--data/icons/48x48/status/Makefile.am10
-rw-r--r--data/icons/Makefile.am15
-rw-r--r--data/icons/scalable/Makefile.am1
-rw-r--r--data/icons/scalable/categories/Makefile.am9
-rw-r--r--data/icons/scalable/status/Makefile.am10
21 files changed, 40 insertions, 153 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
new file mode 100644
index 0000000..76bed98
--- /dev/null
+++ b/data/CMakeLists.txt
@@ -0,0 +1,38 @@
+# org.ayatana.indicator.session.gschema.xml
+
+find_package(GSettings)
+set(GSETTINGS_COMPILE ON)
+add_schema("org.ayatana.indicator.messages.gschema.xml")
+
+# ayatana-indicator-messages.service
+
+pkg_check_modules(SYSTEMD systemd)
+
+if (${SYSTEMD_FOUND})
+ pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ayatana-indicator-messages.service.in" "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-messages.service" @ONLY)
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-messages.service" DESTINATION "${SYSTEMD_USER_DIR}")
+endif()
+
+# ayatana-indicator-messages.desktop
+
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ayatana-indicator-messages.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-messages.desktop" @ONLY)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-messages.desktop" DESTINATION "${CMAKE_INSTALL_FULL_SYSCONFDIR}/xdg/autostart")
+
+# org.ayatana.indicator.messages
+
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/org.ayatana.indicator.messages" DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/ayatana/indicators")
+
+# icons/*
+
+install(
+ DIRECTORY
+ icons/16x16
+ icons/22x22
+ icons/24x24
+ icons/32x32
+ icons/48x48
+ icons/scalable
+ DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/icons/hicolor"
+ FILES_MATCHING PATTERN "*.png" PATTERN "*.svg"
+)
diff --git a/data/Makefile.am b/data/Makefile.am
deleted file mode 100644
index b88aee5..0000000
--- a/data/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-NULL =
-
-SUBDIRS = icons
-
-xdg_autostartdir = /etc/xdg/autostart
-xdg_autostart_DATA = ayatana-indicator-messages.desktop
-
-%.desktop: %.desktop.in
- $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
-
-gsettings_SCHEMAS = org.ayatana.indicator.messages.gschema.xml
-@GSETTINGS_RULES@
-
-#if defined(HAVE_SYSTEMD)
-systemdservice_file = ayatana-indicator-messages.service
-$(systemdservice_file): $(systemdservice_file).in
- $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
-
-systemddir = $(SYSTEMD_USERDIR)
-systemd_DATA = $(systemdservice_file)
-#endif
-
-indicatordir = $(INDICATOR_DIR)
-dist_indicator_DATA = org.ayatana.indicator.messages
-
-EXTRA_DIST = \
- ayatana-indicator-messages.desktop.in \
- $(gsettings_SCHEMAS) \
- $(systemdservice_file).in \
- $(NULL)
-
-CLEANFILES = \
- $(xdg_autostart_DATA) \
- $(systemdservice_file) \
- $(NULL)
diff --git a/data/ayatana-indicator-messages.desktop.in b/data/ayatana-indicator-messages.desktop.in
index 5fdb313..a2f5036 100644
--- a/data/ayatana-indicator-messages.desktop.in
+++ b/data/ayatana-indicator-messages.desktop.in
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
Name=Ayatana Indicator Messages
-Exec=@pkglibexecdir@/ayatana-indicator-messages-service
+Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-messages/ayatana-indicator-messages-service
NoDisplay=true
StartupNotify=false
Terminal=false
diff --git a/data/ayatana-indicator-messages.service.in b/data/ayatana-indicator-messages.service.in
index a0a3ba0..d6976dd 100644
--- a/data/ayatana-indicator-messages.service.in
+++ b/data/ayatana-indicator-messages.service.in
@@ -4,7 +4,7 @@ PartOf=graphical-session.target
PartOf=ayatana-indicators.target
[Service]
-ExecStart=@pkglibexecdir@/ayatana-indicator-messages-service
+ExecStart=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-messages/ayatana-indicator-messages-service
Restart=on-failure
[Install]
diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
deleted file mode 100644
index 4b46952..0000000
--- a/data/icons/16x16/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = status categories
diff --git a/data/icons/16x16/categories/Makefile.am b/data/icons/16x16/categories/Makefile.am
deleted file mode 100644
index 2ddfa63..0000000
--- a/data/icons/16x16/categories/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-
-iconsdir = $(datadir)/icons/hicolor/16x16/categories
-
-icons_DATA = \
- applications-email-panel.png \
- applications-chat-panel.png \
- applications-microblogging-panel.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 adafb8c..0000000
--- a/data/icons/16x16/status/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-
-iconsdir = $(datadir)/icons/hicolor/16x16/status
-
-icons_DATA = \
- application-running.png \
- indicator-messages.png \
- indicator-messages-new.png
-
-EXTRA_DIST = $(icons_DATA)
-
diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
deleted file mode 100644
index 4b46952..0000000
--- a/data/icons/22x22/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = status categories
diff --git a/data/icons/22x22/categories/Makefile.am b/data/icons/22x22/categories/Makefile.am
deleted file mode 100644
index b1ea14c..0000000
--- a/data/icons/22x22/categories/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-
-iconsdir = $(datadir)/icons/hicolor/22x22/categories
-
-icons_DATA = \
- applications-email-panel.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 470c817..0000000
--- a/data/icons/22x22/status/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-
-iconsdir = $(datadir)/icons/hicolor/22x22/status
-
-icons_DATA = \
- indicator-messages.png \
- indicator-messages-new.png
-
-EXTRA_DIST = $(icons_DATA)
-
diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am
deleted file mode 100644
index d52da2b..0000000
--- a/data/icons/24x24/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = status
diff --git a/data/icons/24x24/status/Makefile.am b/data/icons/24x24/status/Makefile.am
deleted file mode 100644
index 086c404..0000000
--- a/data/icons/24x24/status/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-
-iconsdir = $(datadir)/icons/hicolor/24x24/status
-
-icons_DATA = \
- application-running.png \
- indicator-messages.png \
- indicator-messages-new.png
-
-EXTRA_DIST = $(icons_DATA)
-
diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am
deleted file mode 100644
index 4b46952..0000000
--- a/data/icons/32x32/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = status categories
diff --git a/data/icons/32x32/categories/Makefile.am b/data/icons/32x32/categories/Makefile.am
deleted file mode 100644
index 6fcfb7b..0000000
--- a/data/icons/32x32/categories/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-
-iconsdir = $(datadir)/icons/hicolor/32x32/categories
-
-icons_DATA = \
- applications-email-panel.png \
- applications-chat-panel.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 00f9d53..0000000
--- a/data/icons/32x32/status/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-
-iconsdir = $(datadir)/icons/hicolor/32x32/status
-
-icons_DATA = \
- application-running.png \
- indicator-messages.png \
- indicator-messages-new.png
-
-EXTRA_DIST = $(icons_DATA)
-
diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am
deleted file mode 100644
index d52da2b..0000000
--- a/data/icons/48x48/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = status
diff --git a/data/icons/48x48/status/Makefile.am b/data/icons/48x48/status/Makefile.am
deleted file mode 100644
index 9c560b5..0000000
--- a/data/icons/48x48/status/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-
-iconsdir = $(datadir)/icons/hicolor/48x48/status
-
-icons_DATA = \
- application-running.png \
- indicator-messages.png \
- indicator-messages-new.png
-
-EXTRA_DIST = $(icons_DATA)
-
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
deleted file mode 100644
index 44cd81b..0000000
--- a/data/icons/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-SUBDIRS = scalable 16x16 22x22 24x24 32x32 48x48
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/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 4b46952..0000000
--- a/data/icons/scalable/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = status categories
diff --git a/data/icons/scalable/categories/Makefile.am b/data/icons/scalable/categories/Makefile.am
deleted file mode 100644
index 0fdbbd7..0000000
--- a/data/icons/scalable/categories/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-
-iconsdir = $(datadir)/icons/hicolor/scalable/categories
-
-icons_DATA = \
- applications-email-panel.svg \
- applications-chat-panel.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 59f0256..0000000
--- a/data/icons/scalable/status/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-
-iconsdir = $(datadir)/icons/hicolor/scalable/status
-
-icons_DATA = \
- application-running.svg \
- indicator-messages.svg \
- indicator-messages-new.svg
-
-EXTRA_DIST = $(icons_DATA)
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 09:40:40 +0000