[Xfce4-commits] <xfce4-cpufreq-plugin:master> Updates for new autotools.

[Harald Judt]

Updating branch refs/heads/master
         to 761bd275c466d5ed18420711ac0ea360e13a6205 (commit)
       from 970380078c7f895a716c3dc952d3d030912e38b4 (commit)

commit 761bd275c466d5ed18420711ac0ea360e13a6205
Author: Harald Judt <h.judt at gmx.at>
Date:   Wed Aug 7 09:41:59 2013 +0200

    Updates for new autotools.
    
    Clean up build system files, make the plugin compile with automake-1.13
    and fix bug #9763.

 Makefile.am              |    5 +++++
 configure.ac.in          |   28 ++++++++++++++++++----------
 panel-plugin/Makefile.am |    6 +++---
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e0fa72d..89d5447 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,9 +2,14 @@
 
 SUBDIRS = panel-plugin po icons 
 
+ACLOCAL_AMFLAGS = -I m4
+
 distclean-local:
 	rm -rf *.cache *~
 
+distuninstallcheck_listfiles = \
+    find . -type f -print | grep -v ./share/icons/hicolor/icon-theme.cache
+
 dist-bz2: dist
 	zcat $(PACKAGE)-$(VERSION).tar.gz | bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
 
diff --git a/configure.ac.in b/configure.ac.in
index 1856861..61a5518 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -1,28 +1,36 @@
 dnl configure.ac
 dnl
-dnl xfce4-cpufreq-plugin - Plugin shows Infos about Frequency and Governour of
-dnl                         CPUs
+dnl xfce4-cpufreq-plugin - Show CPU frequency and governour information
 dnl
 
 dnl Version information
-m4_define([xfce4_cpufreq_plugin_version], [1.0.0])
+AC_CONFIG_MACRO_DIR([m4])
+m4_define([cpufreq_version_major], [1])
+m4_define([cpufreq_version_minor], [0])
+m4_define([cpufreq_version_micro], [0])
+m4_define([cpufreq_version_build], [@REVISION@])
+m4_define([cpufreq_version_tag], [git])
+m4_define([cpufreq_version], [cpufreq_version_major().cpufreq_version_minor().cpufreq_version_micro()ifelse(cpufreq_version_tag(), [git], [cpufreq_version_tag()-cpufreq_version_build()], [cpufreq_version_tag()])])
 
 dnl Initialize autoconf
 AC_COPYRIGHT([Copyright (c) 2006 Thomas Schreck <shrek at xfce.org>
-Copyright (c) 2010,2011 Florian Rivoal <frivoal at xfce.org>])
-AC_INIT([xfce4-cpufreq-plugin], [xfce4_cpufreq_plugin_version()],
+              Copyright (c) 2010,2011 Florian Rivoal <frivoal at xfce.org>
+              Copyright (c) 2013 Harald Judt <h.judt at gmx.at>])
+AC_INIT([xfce4-cpufreq-plugin], [cpufreq_version()],
 	[frivoal at xfce.org])
+AC_PREREQ([2.60])
 
 dnl Initialize automake
-AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()])
-AM_CONFIG_HEADER([config.h])
+AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar])
+AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE()
 
 dnl Check for basic programs
-AC_PROG_CC
-AC_PROG_INSTALL
-AC_PROG_LIBTOOL
+AC_PROG_CC()
+AC_PROG_INSTALL()
 AC_PROG_INTLTOOL()
+LT_PREREQ([2.2.6])
+LT_INIT([disable-static])
 
 dnl Check for i18n support
 XDT_I18N([@LINGUAS@])
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index d890f85..68a4047 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -24,10 +24,10 @@ xfce4_cpufreq_plugin_SOURCES =					\
 	xfce4-cpufreq-overview.c				\
 	xfce4-cpufreq-utils.h					\
 	xfce4-cpufreq-utils.c
-	
+
 desktop_in_in_files = xfce4-cpufreq-plugin.desktop.in.in
 desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-	
+
 desktopdir = $(datadir)/xfce4/panel-plugins
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
@@ -37,7 +37,7 @@ EXTRA_DIST = 								\
 
 DISTCLEANFILES =							\
 	$(desktop_DATA) $(desktop_in_files)
-	
+
 # get full path into .desktop file
 %.desktop.in: %.desktop.in.in
 	sed -e "s^@PLUGIN_PATH@^$(libexecdir)/xfce4/panel-plugins^"	\