[Goodies-commits] r7770 - xfmpc/trunk

[Mike Massonnet]

Author: mmassonnet
Date: 2009-07-23 16:05:00 +0000 (Thu, 23 Jul 2009)
New Revision: 7770

Modified:
   xfmpc/trunk/ChangeLog
   xfmpc/trunk/Makefile.am
   xfmpc/trunk/configure.in.in
Log:
Small clean up in the autotools scripts

Modified: xfmpc/trunk/ChangeLog
===================================================================
--- xfmpc/trunk/ChangeLog	2009-07-23 13:44:16 UTC (rev 7769)
+++ xfmpc/trunk/ChangeLog	2009-07-23 16:05:00 UTC (rev 7770)
@@ -1,3 +1,7 @@
+2009-07-23	Mike Massonnet <mmassonnet at xfce.org>
+
+Small clean up in the autotools scripts
+
 2009-07-22	Mike Massonnet <mmassonnet at xfce.org>
 
 Update IDEAS

Modified: xfmpc/trunk/Makefile.am
===================================================================
--- xfmpc/trunk/Makefile.am	2009-07-23 13:44:16 UTC (rev 7769)
+++ xfmpc/trunk/Makefile.am	2009-07-23 16:05:00 UTC (rev 7770)
@@ -2,15 +2,8 @@
 	src								\
 	po
 
-distclean-local:
-	rm -rf *.spec *.cache *~
+dist_man_MANS = xfmpc.1
 
-dist-bz2: dist
-	zcat $(PACKAGE)-$(VERSION).tar.gz | bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
-
-distcheck-bz2: distcheck
-	zcat $(PACKAGE)-$(VERSION).tar.gz | bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
-
 desktopdir = $(datadir)/applications
 desktop_in_files = xfmpc.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@@ -31,7 +24,7 @@
 	intltool-update.in						\
 	$(desktop_in_files)
 
-DISTCLEANFILES =							\
+MAINTAINERCLEANFILES =							\
         aclocal.m4                                                      \
         compile                                                         \
         config.guess                                                    \
@@ -46,9 +39,9 @@
         mkinstalldirs                                                   \
 	intltool-extract						\
 	intltool-merge							\
-	intltool-update							\
+	intltool-update
+
+DISTCLEANFILES =							\
 	$(desktop_DATA)
 
-dist_man_MANS = xfmpc.1
-
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:

Modified: xfmpc/trunk/configure.in.in
===================================================================
--- xfmpc/trunk/configure.in.in	2009-07-23 13:44:16 UTC (rev 7769)
+++ xfmpc/trunk/configure.in.in	2009-07-23 16:05:00 UTC (rev 7770)
@@ -66,7 +66,7 @@
 XDT_CHECK_PACKAGE([LIBMPD], [libmpd], [0.15.0])
 
 dnl Check for valac
-valac_minimum_version=0.7.0
+valac_minimum_version=0.7.1
 if test "x$USE_MAINTAINER_MODE" = "xyes" ; then
 	AC_CHECK_PROG([has_valac], [valac], [yes], [no])
 	AC_PATH_PROG([VALAC], [valac], [valac])
@@ -85,17 +85,6 @@
 dnl ***********************************
 XDT_FEATURE_DEBUG()
 
-dnl *********************************
-dnl *** Check for configure flags ***
-dnl *********************************
-AC_ARG_ENABLE([funky-colors],
-	      [AC_HELP_STRING([--enable-funky-colors], [Build with more funky colors])],
-	      [enable_funkycolors=$enableval],
-	      [enable_funkycolors=no])
-if test "x$enable_funkycolors" = "xyes" ; then
-	AC_DEFINE([MORE_FUNKY_COLOR_ON_SEARCH_ENTRY], [1], [""])
-fi
-
 AC_OUTPUT([
 Makefile
 src/Makefile
@@ -114,7 +103,6 @@
 echo "      You need Vala $valac_minimum_version or higher (run $VALAC --version)"
 echo
 fi
-echo "* Debug Support:    $enable_debug"
-echo "* Funky Colors:     $enable_funkycolors"
+echo "* Debug Support:          $enable_debug"
 echo