From 4046e31368a056d83b41478bc004c50019e2bbcd Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 24 Nov 2003 14:47:28 +0000 Subject: [PATCH] - added desktop file and icon new options --with-desktop-dir and --with-pixmap-dir. - fixed CXXFLAGS for soundbase option. --- hdspconf/Makefile.am | 4 ++++ hdspconf/configure.in | 28 ++++++++++++++++++++++++---- hdspconf/hdspconf.desktop | 10 ++++++++++ hdspconf/pixmaps/Makefile.am | 5 ++++- hdspconf/pixmaps/hdspconf.png | Bin 0 -> 3178 bytes 5 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 hdspconf/hdspconf.desktop create mode 100644 hdspconf/pixmaps/hdspconf.png diff --git a/hdspconf/Makefile.am b/hdspconf/Makefile.am index b2333c3..c55e584 100644 --- 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 fb5f7a4..bbc2da5 100644 --- 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 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 7278f3b..d8b3822 100644 --- 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 index 0000000000000000000000000000000000000000..9e4104529da21e90633c762996cb6b4e976c255f GIT binary patch literal 3178 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 Q`2YX_07*qoM6N<$g4TQX6#xJL literal 0 HcmV?d00001 -- 2.47.1