- added desktop file and icon

  new options --with-desktop-dir and --with-pixmap-dir.
- fixed CXXFLAGS for soundbase option.

diff --git a/hdspconf/Makefile.am b/hdspconf/Makefile.am
index b2333c32615a75c16a3211563e7110513ede67ec..c55e58499faad057de5ef5ee0c9d3bbbdd15a2cc 100644 (file)
--- a/hdspconf/Makefile.am
+++ b/hdspconf/Makefile.am
@@ -1,5 +1,9 @@
+EXTRA_DIST = hdspconf.desktop
 SUBDIRS = src pixmaps
 
+desktopdir = $(DESKTOP_DIR)
+desktop_DATA = hdspconf.desktop
+
 alsa-dist: distdir
        @rm -rf ../distdir/hdspconf
        @mkdir -p ../distdir/hdspconf

diff --git a/hdspconf/configure.in b/hdspconf/configure.in
index fb5f7a44acb4c5b61d89571f342a36dfcafaacef..bbc2da5abc5ccebe7d67ee99aca1d41c02649205 100644 (file)
--- a/hdspconf/configure.in
+++ b/hdspconf/configure.in
@@ -1,12 +1,12 @@
 AC_INIT(src/hdspconf.cxx)
-AM_INIT_AUTOMAKE(hdspconf, 1.2)
+AM_INIT_AUTOMAKE(hdspconf, 1.3)
 
 AC_PROG_CXX
 AC_PROG_MAKE_SET
 AC_STDC_HEADERS
 AC_PATH_X
 
-AM_PATH_ALSA(0.9.0)
+AM_PATH_ALSA(1.0.0)
 
 dnl kernel header files
 AC_MSG_CHECKING(for kernel header files)
@@ -32,7 +32,7 @@ AC_ARG_WITH(soundbase,
   [soundbasedir="$withval"], [soundbasedir="$kerneldir"])
 if test "$soundbasedir" != "" -a -r "$soundbasedir/sound" ; then
   ALSA_CFLAGS="$ALSA_CFLAGS -I$soundbasedir"
-  CFLAGS="$CFLAGS -I$soundbasedir"
+  CXXFLAGS="$CXXFLAGS -I$soundbasedir"
   AC_MSG_RESULT($ALSA_CFLAGS)
 else
   if test "x$prefix" != xNONE; then
@@ -42,13 +42,33 @@ else
   fi
   if test -z "$soundbasedir" -a -r "$aprefix/include/sound"; then
     ALSA_CFLAGS="$ALSA_CFLAGS -I$aprefix/include"
-    CFLAGS="$CFLAGS -I$aprefix/include"
+    CXXFLAGS="$CXXFLAGS -I$aprefix/include"
     AC_MSG_RESULT($ALSA_CFLAGS)
   else
     AC_MSG_RESULT("not specified - using C compiler defaults")
   fi
 fi
 
+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"; then
   AC_MSG_ERROR(no fltk-config is found)

diff --git a/hdspconf/hdspconf.desktop b/hdspconf/hdspconf.desktop
new file mode 100644 (file)
index 0000000..732745c
--- /dev/null
+++ b/hdspconf/hdspconf.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=HDSPConf
+Comment=Hammerfall DSP control application
+Exec=hdspconf
+FilePattern=hdspconf
+Icon=hdspconf.png
+Terminal=false
+Type=Application
+Categories=Application;AudioVideo;

diff --git a/hdspconf/pixmaps/Makefile.am b/hdspconf/pixmaps/Makefile.am
index 7278f3b57ce8069aeb0af591ae53d1aedc7cf7d3..d8b3822a1446da0e9603e8db34b366273d1a75c3 100644 (file)
--- a/hdspconf/pixmaps/Makefile.am
+++ b/hdspconf/pixmaps/Makefile.am
@@ -1 +1,4 @@
-EXTRA_DIST = $(wildcard *.xpm)
+pixmapdir = $(PIXMAP_DIR)
+pixmap_DATA = hdspconf.png
+
+EXTRA_DIST = $(wildcard *.xpm) hdspconf.png

diff --git a/hdspconf/pixmaps/hdspconf.png b/hdspconf/pixmaps/hdspconf.png
new file mode 100644 (file)
index 0000000..9e41045
Binary files /dev/null and b/hdspconf/pixmaps/hdspconf.png differ