* Improve configure and make files.

* Bump version for release.
* Set svn keywords.


(Old svn revision: 2397)
This commit is contained in:
Nick Schermer 2007-01-17 17:46:35 +00:00
parent 9b84ce6f4a
commit 9a6c68184a
17 changed files with 141 additions and 34 deletions

View file

@ -1,3 +1,9 @@
2007-01-17 Nick Schermer <nick@xfce.org>
* Improve configure and make files.
* Bump version for release.
* Set svn keywords.
2006-09-11 15:00 nick 2006-09-11 15:00 nick
* Update to new panel api * Update to new panel api

View file

@ -1,13 +1,11 @@
# $Id$
SUBDIRS = \ SUBDIRS = \
panel-plugin \ panel-plugin \
themes \ themes \
icons \ icons \
po po
AUTOMAKE_OPTIONS = \
1.8 \
dist-bzip2
distclean-local: distclean-local:
rm -rf *.spec *.cache *~ rm -rf *.spec *.cache *~
@ -24,3 +22,5 @@ DISTCLEANFILES = \
intltool-extract \ intltool-extract \
intltool-merge \ intltool-merge \
intltool-update intltool-update
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:

View file

@ -1,46 +1,71 @@
dnl configure.in.in dnl $Id$
dnl dnl
dnl xfce4-eyes-plugin - eyes that spy on you dnl xfce4-eyes-plugin - eyes that spy on you
dnl dnl
dnl
dnl version info dnl ***************************
m4_define([eyes_version], [4.3.99.1]) 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 dnl ***************************
AC_INIT([xfce4-eyes-plugin], [eyes_version], [goodies-dev@xfce.org]) 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_PREREQ([2.50])
AC_CANONICAL_TARGET()
AC_REVISION([$Id])
dnl init automake dnl ***************************
EYES_VERSION=eyes_version dnl *** Initialize automake ***
AM_INIT_AUTOMAKE([xfce4-eyes-plugin], [$EYES_VERSION]) dnl ***************************
AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar])
AM_CONFIG_HEADER([config.h]) AM_CONFIG_HEADER([config.h])
AM_MAINTAINER_MODE AM_MAINTAINER_MODE()
dnl check for basic programs dnl ********************************
AC_PROG_CC dnl *** Check for basic programs ***
AC_PROG_INSTALL dnl ********************************
AC_PROG_LIBTOOL AC_PROG_CC()
AC_PROG_LD()
AC_PROG_INSTALL()
AC_PROG_INTLTOOL() AC_PROG_INTLTOOL()
dnl check for standard header files dnl **********************************
AC_HEADER_STDC dnl *** Check for standard headers ***
dnl **********************************
AC_HEADER_STDC()
AC_CHECK_HEADERS([math.h]) AC_CHECK_HEADERS([math.h])
dnl check for math library dnl ******************************
dnl *** Check for math library ***
dnl ******************************
AC_CHECK_LIB([m], [sin]) AC_CHECK_LIB([m], [sin])
dnl check for i18n support dnl ******************************
dnl *** Check for i18n support ***
dnl ******************************
XDT_I18N([@LINGUAS@]) 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([GTHREAD], [gthread-2.0], [2.6.0])
XDT_CHECK_PACKAGE([GTK], [gtk+-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([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90.2])
XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-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]) 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() XDT_FEATURE_DEBUG()
AC_OUTPUT([ AC_OUTPUT([

View file

@ -1,6 +1,10 @@
# $Id$
iconsdir = $(datadir)/icons/hicolor/48x48/apps iconsdir = $(datadir)/icons/hicolor/48x48/apps
icons_DATA = \ icons_DATA = \
xfce4-eyes.png xfce4-eyes.png
EXTRA_DIST = \ EXTRA_DIST = \
$(icons_DATA) $(icons_DATA)
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:

View file

@ -1,3 +1,4 @@
# $Id$
SUBDIRS = \ SUBDIRS = \
48x48 48x48
@ -14,3 +15,5 @@ install-data-hook:
echo "*** $(gtk_update_icon_cache)"; \ echo "*** $(gtk_update_icon_cache)"; \
echo "***"; \ echo "***"; \
fi fi
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:

View file

@ -1,3 +1,10 @@
# $Id$
INCLUDES = \
-I$(top_srcdir) \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
-DTHEMESDIR=\"$(datadir)/xfce4/eyes/themes\"
plugindir = $(libexecdir)/xfce4/panel-plugins plugindir = $(libexecdir)/xfce4/panel-plugins
plugin_PROGRAMS = xfce4-eyes-plugin plugin_PROGRAMS = xfce4-eyes-plugin
@ -8,12 +15,9 @@ xfce4_eyes_plugin_SOURCES = \
themes.c themes.c
xfce4_eyes_plugin_CFLAGS = \ xfce4_eyes_plugin_CFLAGS = \
-I$(top_srcdir) \
$(LIBXFCEGUI4_CFLAGS) \ $(LIBXFCEGUI4_CFLAGS) \
$(LIBXFCE4PANEL_CFLAGS) \ $(LIBXFCE4PANEL_CFLAGS)
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
-DTHEMESDIR=\"$(datadir)/xfce4/eyes/themes\"
xfce4_eyes_plugin_LDADD = \ xfce4_eyes_plugin_LDADD = \
$(LIBXFCE4PANEL_LIBS) \ $(LIBXFCE4PANEL_LIBS) \
$(LIBXFCEGUI4_LIBS) $(LIBXFCEGUI4_LIBS)
@ -33,3 +37,4 @@ CLEANFILES = \
$(desktop_in_files) \ $(desktop_in_files) \
$(desktop_DATA) $(desktop_DATA)
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:

View file

@ -1,4 +1,5 @@
/* /* $Id$
*
* Copyright (c) Benedikt Meurer <benedikt.meurer@unix-ag.uni-siegen.de>> * Copyright (c) Benedikt Meurer <benedikt.meurer@unix-ag.uni-siegen.de>>
* Copyright (c) Danny Milosavljevic <danny_milo@gmx.net> * Copyright (c) Danny Milosavljevic <danny_milo@gmx.net>
* Copyright (c) Dave Camp * Copyright (c) Dave Camp

View file

@ -1,5 +1,21 @@
/* $Id$
*
* Copyright (C) 1999 Dave Camp <dave@davec.dhs.org>
*
* 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__ #ifndef __EYES_H__
#define __EYES_H__ #define __EYES_H__

View file

@ -1,4 +1,5 @@
/* /* $Id$
*
* Copyright (C) 1999 Dave Camp <dave@davec.dhs.org> * Copyright (C) 1999 Dave Camp <dave@davec.dhs.org>
* *
* This program is free software; you can redistribute it and/or modify * 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 * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
*/ */
#include <config.h> #include <config.h>

View file

@ -1,3 +1,22 @@
/* $Id$
*
* Copyright (C) 1999 Dave Camp <dave@davec.dhs.org>
*
* 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__ #ifndef __THEMES_H__
#define __THEMES_H__ #define __THEMES_H__
#include <gtk/gtk.h> #include <gtk/gtk.h>

View file

@ -1,3 +1,5 @@
# $Id$
Bizarredir = $(datadir)/xfce4/eyes/themes/Bizarre Bizarredir = $(datadir)/xfce4/eyes/themes/Bizarre
Bizarre_DATA = \ Bizarre_DATA = \
@ -6,3 +8,5 @@ Bizarre_DATA = \
config config
EXTRA_DIST = $(Bizarre_DATA) EXTRA_DIST = $(Bizarre_DATA)
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:

View file

@ -1,3 +1,5 @@
# $Id$
Bloodshotdir = $(datadir)/xfce4/eyes/themes/Bloodshot Bloodshotdir = $(datadir)/xfce4/eyes/themes/Bloodshot
Bloodshot_DATA = \ Bloodshot_DATA = \
@ -6,3 +8,5 @@ Bloodshot_DATA = \
config config
EXTRA_DIST = $(Bloodshot_DATA) EXTRA_DIST = $(Bloodshot_DATA)
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:

View file

@ -1,3 +1,5 @@
# $Id$
Default_tinydir = $(datadir)/xfce4/eyes/themes/Default-tiny Default_tinydir = $(datadir)/xfce4/eyes/themes/Default-tiny
Default_tiny_DATA = \ Default_tiny_DATA = \
@ -6,3 +8,5 @@ Default_tiny_DATA = \
config config
EXTRA_DIST = $(Default_tiny_DATA) EXTRA_DIST = $(Default_tiny_DATA)
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:

View file

@ -1,3 +1,5 @@
# $Id$
Defaultdir = $(datadir)/xfce4/eyes/themes/Default Defaultdir = $(datadir)/xfce4/eyes/themes/Default
Default_DATA = \ Default_DATA = \
@ -6,3 +8,5 @@ Default_DATA = \
config config
EXTRA_DIST = $(Default_DATA) EXTRA_DIST = $(Default_DATA)
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:

View file

@ -1,3 +1,5 @@
# $Id$
Horriddir = $(datadir)/xfce4/eyes/themes/Horrid Horriddir = $(datadir)/xfce4/eyes/themes/Horrid
Horrid_DATA = \ Horrid_DATA = \
@ -6,3 +8,5 @@ Horrid_DATA = \
config config
EXTRA_DIST = $(Horrid_DATA) EXTRA_DIST = $(Horrid_DATA)
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:

View file

@ -1,3 +1,5 @@
# $Id$
SUBDIRS = \ SUBDIRS = \
Bizarre \ Bizarre \
Bloodshot \ Bloodshot \
@ -5,3 +7,5 @@ SUBDIRS = \
Default-tiny \ Default-tiny \
Horrid \ Horrid \
Tango Tango
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:

View file

@ -1,3 +1,5 @@
# $Id$
Tangodir = $(datadir)/xfce4/eyes/themes/Tango Tangodir = $(datadir)/xfce4/eyes/themes/Tango
Tango_DATA = \ Tango_DATA = \
@ -7,3 +9,5 @@ Tango_DATA = \
EXTRA_DIST = \ EXTRA_DIST = \
$(Tango_DATA) $(Tango_DATA)
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake: