hdspconf: move .desktop and icon files to desktop, use modern destination for icons
authorJaroslav Kysela <perex@perex.cz>
Wed, 15 Nov 2017 09:43:48 +0000 (10:43 +0100)
committerJaroslav Kysela <perex@perex.cz>
Wed, 15 Nov 2017 10:15:12 +0000 (11:15 +0100)
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

.gitignore
hdspconf/Makefile.am
hdspconf/configure.ac
hdspconf/desktop/Makefile.am [new file with mode: 0644]
hdspconf/desktop/hdspconf.desktop [moved from hdspconf/hdspconf.desktop with 100% similarity]
hdspconf/desktop/hicolor_apps_48x48_hdspconf.png [moved from hdspconf/pixmaps/hdspconf.png with 100% similarity]
hdspconf/pixmaps/Makefile.am

index f765810..57c5d65 100644 (file)
@@ -53,6 +53,7 @@ hdspconf/configure
 hdspconf/src/hdspconf
 hdspconf/src/Makefile
 hdspconf/pixmaps/Makefile
+hdspconf/desktop/Makefile
 hdspmixer/Makefile
 hdspmixer/configure
 hdspmixer/src/hdspmixer
index e4a4bd8..3fdfb34 100644 (file)
@@ -1,8 +1,5 @@
-EXTRA_DIST = gitcompile hdspconf.desktop depcomp
-SUBDIRS = src pixmaps
-
-desktopdir = $(DESKTOP_DIR)
-desktop_DATA = hdspconf.desktop
+EXTRA_DIST = gitcompile depcomp
+SUBDIRS = src pixmaps desktop
 
 alsa-dist: distdir
        @rm -rf ../distdir/hdspconf
index f0b0c95..e11d481 100644 (file)
@@ -39,4 +39,4 @@ FLTK_LIBS=`$FLTK_CONFIG $fltk_config_args --ldflags`
 CXXFLAGS="$CXXFLAGS $ALSA_CFLAGS $FLTK_CXXFLAGS"
 LIBS="$LIBS $ALSA_LIBS $FLTK_LIBS"
 
-AC_OUTPUT(Makefile src/Makefile pixmaps/Makefile)
+AC_OUTPUT(Makefile src/Makefile pixmaps/Makefile desktop/Makefile)
diff --git a/hdspconf/desktop/Makefile.am b/hdspconf/desktop/Makefile.am
new file mode 100644 (file)
index 0000000..c143498
--- /dev/null
@@ -0,0 +1,34 @@
+APPNAME = hdspconf
+
+desktopdir = $(datadir)/applications
+desktop_DATA = $(APPNAME).desktop
+
+public_icons = \
+       hicolor_apps_48x48_$(APPNAME).png
+
+EXTRA_DIST = \
+       $(public_icons)         \
+       $(desktop_DATA)
+
+install-icons:
+       for icon in $(public_icons); do \
+               THEME=`echo $$icon | cut -d_ -f1`; \
+               CONTEXT=`echo $$icon | cut -d_ -f2`; \
+               SIZE=`echo $$icon | cut -d_ -f3`; \
+               ICONFILE=`echo $$icon | cut -d_ -f4`; \
+               mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
+               $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+       done
+
+uninstall-icons:
+       -for icon in $(public_icons); do \
+               THEME=`echo $$icon | cut -d_ -f1`; \
+               CONTEXT=`echo $$icon | cut -d_ -f2`; \
+               SIZE=`echo $$icon | cut -d_ -f3`; \
+               ICONFILE=`echo $$icon | cut -d_ -f4`; \
+               rm -f $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+       done
+
+install-data-local: install-icons
+
+uninstall-local: uninstall-icons
index d8b3822..7278f3b 100644 (file)
@@ -1,4 +1 @@
-pixmapdir = $(PIXMAP_DIR)
-pixmap_DATA = hdspconf.png
-
-EXTRA_DIST = $(wildcard *.xpm) hdspconf.png
+EXTRA_DIST = $(wildcard *.xpm)