From 9a6c68184ad8abb362b93723f62015495a596ee8 Mon Sep 17 00:00:00 2001 From: Nick Schermer Date: Wed, 17 Jan 2007 17:46:35 +0000 Subject: [PATCH] * Improve configure and make files. * Bump version for release. * Set svn keywords. (Old svn revision: 2397) --- ChangeLog | 6 +++ Makefile.am | 8 ++-- configure.in.in | 65 +++++++++++++++++++++++---------- icons/48x48/Makefile.am | 4 ++ icons/Makefile.am | 3 ++ panel-plugin/Makefile.am | 15 +++++--- panel-plugin/eyes.c | 3 +- panel-plugin/eyes.h | 20 +++++++++- panel-plugin/themes.c | 4 +- panel-plugin/themes.h | 19 ++++++++++ themes/Bizarre/Makefile.am | 4 ++ themes/Bloodshot/Makefile.am | 4 ++ themes/Default-tiny/Makefile.am | 4 ++ themes/Default/Makefile.am | 4 ++ themes/Horrid/Makefile.am | 4 ++ themes/Makefile.am | 4 ++ themes/Tango/Makefile.am | 4 ++ 17 files changed, 141 insertions(+), 34 deletions(-) diff --git a/ChangeLog b/ChangeLog index d3b437c..b58b9a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-01-17 Nick Schermer + + * Improve configure and make files. + * Bump version for release. + * Set svn keywords. + 2006-09-11 15:00 nick * Update to new panel api diff --git a/Makefile.am b/Makefile.am index d57a57e..0387161 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,13 +1,11 @@ +# $Id$ + SUBDIRS = \ panel-plugin \ themes \ icons \ po -AUTOMAKE_OPTIONS = \ - 1.8 \ - dist-bzip2 - distclean-local: rm -rf *.spec *.cache *~ @@ -24,3 +22,5 @@ DISTCLEANFILES = \ intltool-extract \ intltool-merge \ intltool-update + +# vi:set ts=8 sw=8 noet ai nocindent syntax=automake: \ No newline at end of file diff --git a/configure.in.in b/configure.in.in index d115ecb..1b83ea9 100644 --- a/configure.in.in +++ b/configure.in.in @@ -1,46 +1,71 @@ -dnl configure.in.in +dnl $Id$ dnl dnl xfce4-eyes-plugin - eyes that spy on you dnl -dnl -dnl version info -m4_define([eyes_version], [4.3.99.1]) +dnl *************************** +dnl *** Version information *** +dnl *************************** +m4_define([eyes_version_major], [4]) +m4_define([eyes_version_minor], [4]) +m4_define([eyes_version_micro], [0]) +m4_define([eyes_version_build], [r@REVISION@]) +m4_define([eyes_version_tag], [svn]) +m4_define([eyes_version], [eyes_version_major().eyes_version_minor().eyes_version_micro()ifelse(eyes_version_tag(), [svn], [eyes_version_tag()-eyes_version_build()], [eyes_version_tag()])]) -dnl init autoconf -AC_INIT([xfce4-eyes-plugin], [eyes_version], [goodies-dev@xfce.org]) +dnl *************************** +dnl *** Initialize autoconf *** +dnl *************************** +AC_COPYRIGHT([Copyright (c) 2006-2007 + The Xfce development team. All rights reserved.]) +AC_INIT([xfce4-eyes-plugin], [eyes_version()], [http://bugzilla.xfce.org/], [xfce4-eyes-plugin]) AC_PREREQ([2.50]) +AC_CANONICAL_TARGET() +AC_REVISION([$Id]) -dnl init automake -EYES_VERSION=eyes_version -AM_INIT_AUTOMAKE([xfce4-eyes-plugin], [$EYES_VERSION]) +dnl *************************** +dnl *** Initialize automake *** +dnl *************************** +AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar]) AM_CONFIG_HEADER([config.h]) -AM_MAINTAINER_MODE +AM_MAINTAINER_MODE() -dnl check for basic programs -AC_PROG_CC -AC_PROG_INSTALL -AC_PROG_LIBTOOL +dnl ******************************** +dnl *** Check for basic programs *** +dnl ******************************** +AC_PROG_CC() +AC_PROG_LD() +AC_PROG_INSTALL() AC_PROG_INTLTOOL() -dnl check for standard header files -AC_HEADER_STDC +dnl ********************************** +dnl *** Check for standard headers *** +dnl ********************************** +AC_HEADER_STDC() AC_CHECK_HEADERS([math.h]) -dnl check for math library +dnl ****************************** +dnl *** Check for math library *** +dnl ****************************** AC_CHECK_LIB([m], [sin]) -dnl check for i18n support +dnl ****************************** +dnl *** Check for i18n support *** +dnl ****************************** XDT_I18N([@LINGUAS@]) -dnl check for required packages +dnl *********************************** +dnl *** Check for required packages *** +dnl *********************************** XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0]) XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0]) XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90.2]) XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.90.2]) XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.99.1]) -dnl check for debugging support +dnl *********************************** +dnl *** Check for debugging support *** +dnl *********************************** XDT_FEATURE_DEBUG() AC_OUTPUT([ diff --git a/icons/48x48/Makefile.am b/icons/48x48/Makefile.am index efb084d..c8ed01e 100644 --- a/icons/48x48/Makefile.am +++ b/icons/48x48/Makefile.am @@ -1,6 +1,10 @@ +# $Id$ + iconsdir = $(datadir)/icons/hicolor/48x48/apps icons_DATA = \ xfce4-eyes.png EXTRA_DIST = \ $(icons_DATA) + +# vi:set ts=8 sw=8 noet ai nocindent syntax=automake: diff --git a/icons/Makefile.am b/icons/Makefile.am index d2f71aa..c9b3c6f 100644 --- a/icons/Makefile.am +++ b/icons/Makefile.am @@ -1,3 +1,4 @@ +# $Id$ SUBDIRS = \ 48x48 @@ -14,3 +15,5 @@ install-data-hook: echo "*** $(gtk_update_icon_cache)"; \ echo "***"; \ fi + +# vi:set ts=8 sw=8 noet ai nocindent syntax=automake: diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am index ccecfdb..6779b0e 100644 --- a/panel-plugin/Makefile.am +++ b/panel-plugin/Makefile.am @@ -1,3 +1,10 @@ +# $Id$ + +INCLUDES = \ + -I$(top_srcdir) \ + -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ + -DTHEMESDIR=\"$(datadir)/xfce4/eyes/themes\" + plugindir = $(libexecdir)/xfce4/panel-plugins plugin_PROGRAMS = xfce4-eyes-plugin @@ -8,12 +15,9 @@ xfce4_eyes_plugin_SOURCES = \ themes.c xfce4_eyes_plugin_CFLAGS = \ - -I$(top_srcdir) \ $(LIBXFCEGUI4_CFLAGS) \ - $(LIBXFCE4PANEL_CFLAGS) \ - -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ - -DTHEMESDIR=\"$(datadir)/xfce4/eyes/themes\" - + $(LIBXFCE4PANEL_CFLAGS) + xfce4_eyes_plugin_LDADD = \ $(LIBXFCE4PANEL_LIBS) \ $(LIBXFCEGUI4_LIBS) @@ -33,3 +37,4 @@ CLEANFILES = \ $(desktop_in_files) \ $(desktop_DATA) +# vi:set ts=8 sw=8 noet ai nocindent syntax=automake: diff --git a/panel-plugin/eyes.c b/panel-plugin/eyes.c index 2f1fb25..de998ae 100644 --- a/panel-plugin/eyes.c +++ b/panel-plugin/eyes.c @@ -1,4 +1,5 @@ -/* +/* $Id$ + * * Copyright (c) Benedikt Meurer > * Copyright (c) Danny Milosavljevic * Copyright (c) Dave Camp diff --git a/panel-plugin/eyes.h b/panel-plugin/eyes.h index 91bf99c..422a78c 100644 --- a/panel-plugin/eyes.h +++ b/panel-plugin/eyes.h @@ -1,5 +1,21 @@ - - +/* $Id$ + * + * Copyright (C) 1999 Dave Camp + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ #ifndef __EYES_H__ #define __EYES_H__ diff --git a/panel-plugin/themes.c b/panel-plugin/themes.c index 4621574..e3dda1c 100644 --- a/panel-plugin/themes.c +++ b/panel-plugin/themes.c @@ -1,4 +1,5 @@ -/* +/* $Id$ + * * Copyright (C) 1999 Dave Camp * * This program is free software; you can redistribute it and/or modify @@ -14,7 +15,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * */ #include diff --git a/panel-plugin/themes.h b/panel-plugin/themes.h index 6ab0f47..d705bde 100644 --- a/panel-plugin/themes.h +++ b/panel-plugin/themes.h @@ -1,3 +1,22 @@ +/* $Id$ + * + * Copyright (C) 1999 Dave Camp + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + #ifndef __THEMES_H__ #define __THEMES_H__ #include diff --git a/themes/Bizarre/Makefile.am b/themes/Bizarre/Makefile.am index 1214aaa..1ef65c6 100644 --- a/themes/Bizarre/Makefile.am +++ b/themes/Bizarre/Makefile.am @@ -1,3 +1,5 @@ +# $Id$ + Bizarredir = $(datadir)/xfce4/eyes/themes/Bizarre Bizarre_DATA = \ @@ -6,3 +8,5 @@ Bizarre_DATA = \ config EXTRA_DIST = $(Bizarre_DATA) + +# vi:set ts=8 sw=8 noet ai nocindent syntax=automake: diff --git a/themes/Bloodshot/Makefile.am b/themes/Bloodshot/Makefile.am index 7934f06..2359fee 100644 --- a/themes/Bloodshot/Makefile.am +++ b/themes/Bloodshot/Makefile.am @@ -1,3 +1,5 @@ +# $Id$ + Bloodshotdir = $(datadir)/xfce4/eyes/themes/Bloodshot Bloodshot_DATA = \ @@ -6,3 +8,5 @@ Bloodshot_DATA = \ config EXTRA_DIST = $(Bloodshot_DATA) + +# vi:set ts=8 sw=8 noet ai nocindent syntax=automake: diff --git a/themes/Default-tiny/Makefile.am b/themes/Default-tiny/Makefile.am index 012adae..a4b7a6e 100644 --- a/themes/Default-tiny/Makefile.am +++ b/themes/Default-tiny/Makefile.am @@ -1,3 +1,5 @@ +# $Id$ + Default_tinydir = $(datadir)/xfce4/eyes/themes/Default-tiny Default_tiny_DATA = \ @@ -6,3 +8,5 @@ Default_tiny_DATA = \ config EXTRA_DIST = $(Default_tiny_DATA) + +# vi:set ts=8 sw=8 noet ai nocindent syntax=automake: diff --git a/themes/Default/Makefile.am b/themes/Default/Makefile.am index 018b44d..a70c69f 100644 --- a/themes/Default/Makefile.am +++ b/themes/Default/Makefile.am @@ -1,3 +1,5 @@ +# $Id$ + Defaultdir = $(datadir)/xfce4/eyes/themes/Default Default_DATA = \ @@ -6,3 +8,5 @@ Default_DATA = \ config EXTRA_DIST = $(Default_DATA) + +# vi:set ts=8 sw=8 noet ai nocindent syntax=automake: diff --git a/themes/Horrid/Makefile.am b/themes/Horrid/Makefile.am index d1bc8b0..ce0bfed 100644 --- a/themes/Horrid/Makefile.am +++ b/themes/Horrid/Makefile.am @@ -1,3 +1,5 @@ +# $Id$ + Horriddir = $(datadir)/xfce4/eyes/themes/Horrid Horrid_DATA = \ @@ -6,3 +8,5 @@ Horrid_DATA = \ config EXTRA_DIST = $(Horrid_DATA) + +# vi:set ts=8 sw=8 noet ai nocindent syntax=automake: diff --git a/themes/Makefile.am b/themes/Makefile.am index af4b53a..de46cc4 100644 --- a/themes/Makefile.am +++ b/themes/Makefile.am @@ -1,3 +1,5 @@ +# $Id$ + SUBDIRS = \ Bizarre \ Bloodshot \ @@ -5,3 +7,5 @@ SUBDIRS = \ Default-tiny \ Horrid \ Tango + +# vi:set ts=8 sw=8 noet ai nocindent syntax=automake: diff --git a/themes/Tango/Makefile.am b/themes/Tango/Makefile.am index 5889a3b..86806d4 100644 --- a/themes/Tango/Makefile.am +++ b/themes/Tango/Makefile.am @@ -1,3 +1,5 @@ +# $Id$ + Tangodir = $(datadir)/xfce4/eyes/themes/Tango Tango_DATA = \ @@ -7,3 +9,5 @@ Tango_DATA = \ EXTRA_DIST = \ $(Tango_DATA) + +# vi:set ts=8 sw=8 noet ai nocindent syntax=automake: