hdspconf: move .desktop and icon files to desktop, use modern destination for icons

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

.gitignore

@@ -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

hdspconf/Makefile.am

@@ -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

hdspconf/configure.ac

@@ -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)

hdspconf/desktop/Makefile.am

@@ -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

hdspconf/pixmaps/Makefile.am

@@ -1,4 +1 @@
-pixmapdir = $(PIXMAP_DIR)
-pixmap_DATA = hdspconf.png
-
-EXTRA_DIST = $(wildcard *.xpm) hdspconf.png
+EXTRA_DIST = $(wildcard *.xpm)