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

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

diff --git a/.gitignore b/.gitignore
index c5debca65ec46556b6373b5e5508ed6c6033231a..f765810ff72ad6032fa916a4d3c9bbc8c713fd05 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -57,6 +57,7 @@ hdspmixer/Makefile
 hdspmixer/configure
 hdspmixer/src/hdspmixer
 hdspmixer/pixmaps/Makefile
+hdspmixer/desktop/Makefile
 hdspmixer/src/Makefile
 hdsploader/Makefile
 hdsploader/configure

diff --git a/hdspmixer/Makefile.am b/hdspmixer/Makefile.am
index 86a759c3da8c03e2692395a68866024c1b395db4..85c117756be46df5f81bd54b8f8902099f2c34d2 100644 (file)
--- a/hdspmixer/Makefile.am
+++ b/hdspmixer/Makefile.am
@@ -1,8 +1,5 @@
-EXTRA_DIST = gitcompile hdspmixer.desktop depcomp
-SUBDIRS = src pixmaps
-
-desktopdir = $(DESKTOP_DIR)
-desktop_DATA = hdspmixer.desktop
+EXTRA_DIST = gitcompile depcomp
+SUBDIRS = src pixmaps desktop
 
 alsa-dist: distdir
        @rm -rf ../distdir/hdspmixer

diff --git a/hdspmixer/configure.ac b/hdspmixer/configure.ac
index 0b32dba21c9bd10ea6469fbaac1b48bf3871348e..167e4f45c1bc892c836a3835d5dd5e2375dda452 100644 (file)
--- a/hdspmixer/configure.ac
+++ b/hdspmixer/configure.ac
@@ -9,25 +9,6 @@ AC_PATH_X
 
 AM_PATH_ALSA(1.0.0)
 
-dnl desktop install
-AC_ARG_WITH(desktop-dir,
-  [ --with-desktop-dir  specify the path to install desktop file],
-  [desktopdir="$withval"], [desktopdir=""])
-if test -z "$desktopdir"; then
-  desktopdir=$datadir/applications
-fi
-DESKTOP_DIR="$desktopdir"
-AC_SUBST(DESKTOP_DIR)
-       
-AC_ARG_WITH(pixmap-dir,
-  [ --with-pixmap-dir  specify the path to install desktop pixmap file],
-  [pixmapdir="$withval"], [pixmapdir=""])
-if test -z "$pixmapdir"; then
-  pixmapdir=$datadir/pixmaps
-fi
-PIXMAP_DIR="$pixmapdir"
-AC_SUBST(PIXMAP_DIR)
-
 dnl library check
 AC_PATH_PROG(FLTK_CONFIG, fltk-config, no)
 if test "$FLTK_CONFIG" = "no" && ! test "`hostname -f`" = "alsa.alsa-project.org"; then
@@ -39,4 +20,4 @@ FLTK_LIBS="`$FLTK_CONFIG --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/hdspmixer/desktop/Makefile.am b/hdspmixer/desktop/Makefile.am
new file mode 100644 (file)
index 0000000..adafcd8
--- /dev/null
+++ b/hdspmixer/desktop/Makefile.am
@@ -0,0 +1,34 @@
+APPNAME = hdspmixer
+
+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

diff --git a/hdspmixer/hdspmixer.desktop b/hdspmixer/desktop/hdspmixer.desktop
similarity index 100%
rename from hdspmixer/hdspmixer.desktop
rename to hdspmixer/desktop/hdspmixer.desktop

diff --git a/hdspmixer/pixmaps/hdspmixer.png b/hdspmixer/desktop/hicolor_apps_48x48_hdspmixer.png
similarity index 100%
rename from hdspmixer/pixmaps/hdspmixer.png
rename to hdspmixer/desktop/hicolor_apps_48x48_hdspmixer.png

diff --git a/hdspmixer/pixmaps/Makefile.am b/hdspmixer/pixmaps/Makefile.am
index c81fc957d764255cc5ae7cdde0f1dfc19f36401b..c1cdf2cacc632e6f91e78ff2a2c98f45a9c189cf 100644 (file)
--- a/hdspmixer/pixmaps/Makefile.am
+++ b/hdspmixer/pixmaps/Makefile.am
@@ -1,4 +1,3 @@
 pixmapdir = $(PIXMAP_DIR)
-pixmap_DATA = hdspmixer.png
 
-EXTRA_DIST = $(wildcard *.xpm) hdspmixer.png
+EXTRA_DIST = $(wildcard *.xpm)