diff options
| -rw-r--r-- | .cvsignore | 44 | ||||
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.am | 23 | ||||
| -rwxr-xr-x | autogen.sh | 4 | ||||
| -rw-r--r-- | configure.in | 91 | ||||
| -rw-r--r-- | data/Makefile.am | 2 | ||||
| -rw-r--r-- | po/.cvsignore | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 22 |
8 files changed, 97 insertions, 97 deletions
@@ -1,29 +1,29 @@ -Makefile -Makefile.in aclocal.m4 autom4te.cache -intltool-update -intltool-update.in -intltool-merge -intltool-merge.in +*.bz2 +compile +config.h +config.h.in +config.log +config.status +configure +depcomp +gnome-doc-utils.make +*.gz +INSTALL +install-sh intltool-extract intltool-extract.in +intltool-merge +intltool-merge.in intltool-modules -config.status -config.log -config.h.in -config.h -configure -stamp-h.in -stamp-h1 +intltool-update +intltool-update.in +Makefile +Makefile.in +missing +mkinstalldirs stamp-h +stamp-h1 +stamp-h.in zenity.spec -omf.make -xmldocs.make -*.gz -mkinstalldirs -missing -install-sh -depcomp -INSTALL -gnome-doc-utils.make @@ -1,3 +1,10 @@ +2006-05-10 Lucas Rocha <lucasr@gnome.org> + + * .cvsignore, Makefile.am, autogen.sh, configure.in, + data/Makefile.am, po/.cvsignore, src/Makefile.am: move to + automake 1.9 and several cleanups (Fixes bug #341056). + Patch from Christian Persch <chpe@gnome.org>. + 2006-04-29 Lucas Rocha <lucasr@gnome.org> * configure.in: post release version bump. diff --git a/Makefile.am b/Makefile.am index 961adbc3..b1543866 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,23 +1,3 @@ -# -# FIXME: -# currently scrollkeeper-update does not seem to -# remove its database when there is no useful -# information contained there. Therefore, with -# "make uninstall" you're left with loads of -# stuff in /var/scrollkeeper and distcheck -# fails. -# -# http://mail.gnome.org/archives/gnome-doc-list/2003-May/msg00008.html -# -# This overrides the uninstall check so distcheck -# passes -# -# distuninstallcheck_listfiles = find . -type f -print | grep -v 'scrollkeeper' | grep -v 'omf' | grep -v 'figures' -distuninstallcheck: - @: - -distcleancheck_listfiles = find . -type f -print | grep -v 'omf\.out' | grep -v 'legal.xml' - SUBDIRS = \ src \ po \ @@ -25,13 +5,12 @@ SUBDIRS = \ help EXTRA_DIST = \ + autogen.sh \ intltool-extract.in \ intltool-merge.in \ intltool-update.in \ zenity.spec \ zenity.spec.in \ - omf.make \ - xmldocs.make \ COPYING \ HACKING \ ChangeLog \ @@ -5,7 +5,7 @@ srcdir=`dirname $0` test -z "$srcdir" && srcdir=. PKG_NAME="zenity" -REQUIRED_AUTOMAKE_VERSION=1.7 +REQUIRED_AUTOMAKE_VERSION=1.9 (test -f $srcdir/configure.in \ && test -f $srcdir/ChangeLog \ @@ -20,4 +20,4 @@ which gnome-autogen.sh || { echo "You need to install gnome-common from the GNOME CVS" exit 1 } -USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh +USE_GNOME2_MACROS=1 . gnome-autogen.sh diff --git a/configure.in b/configure.in index 31bef9e2..cbde9fbf 100644 --- a/configure.in +++ b/configure.in @@ -1,8 +1,13 @@ -AC_PREREQ(2.53) -AC_INIT(src) -AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(zenity, 2.15.2) +AC_INIT([Zenity],[2.15.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=zenity],[zenity]) +AC_PREREQ([2.59]) + +AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_SRCDIR([src]) + +AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip]) + +GNOME_COMMON_INIT GNOME_DOC_INIT AM_MAINTAINER_MODE @@ -11,62 +16,58 @@ IT_PROG_INTLTOOL([0.34.90]) AC_PROG_CC -GTK_REQUIRED=2.6.0 +GTK_REQUIRED=2.9.0 -PKG_CHECK_MODULES(ZENITY, gtk+-2.0 >= $GTK_REQUIRED libglade-2.0 libgnomecanvas-2.0 glib-2.0 >= 2.7.3) -AC_SUBST(ZENITY_CFLAGS) -AC_SUBST(ZENITY_LIBS) +PKG_CHECK_MODULES([ZENITY],[gtk+-2.0 >= $GTK_REQUIRED libglade-2.0 libgnomecanvas-2.0 glib-2.0]) +AC_SUBST([ZENITY_CFLAGS]) +AC_SUBST([ZENITY_LIBS]) -dnl *********************************************** -dnl scrollkeeper checks -dnl *********************************************** +# ******************************* +# perl check +# ******************************* -AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no) -if test x$SCROLLKEEPER_CONFIG = xno; then - AC_MSG_ERROR(Couldn't find scrollkeeper-config. Please install the scrollkeeper package) -fi +AC_PATH_PROG([PERL],[perl],) -dnl ******************************* -dnl perl check -dnl ******************************* +# ******************************* +# libnotify check +# ******************************* -AC_PATH_PROG(PERL,perl,) +LIBNOTIFY_REQUIRED=0.3.2 +PKG_CHECK_MODULES([LIBNOTIFY],[libnotify >= $LIBNOTIFY_REQUIRED], + [HAVE_LIBNOTIFY="yes"],[HAVE_LIBNOTIFY="no"]) +AC_SUBST([LIBNOTIFY_CFLAGS]) +AC_SUBST([LIBNOTIFY_LIBS]) -dnl ******************************* -dnl libnotify check -dnl ******************************* -PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= 0.3.2, - HAVE_LIBNOTIFY="yes", HAVE_LIBNOTIFY="no") if test "x$HAVE_LIBNOTIFY" = "xyes"; then - ZENITY_CFLAGS="$ZENITY_CFLAGS $LIBNOTIFY_CFLAGS" - ZENITY_LIBS="$ZENITY_LIBS $LIBNOTIFY_LIBS" - - AC_SUBST(ZENITY_CFLAGS) - AC_SUBST(ZENITY_LIBS) - AC_DEFINE(HAVE_LIBNOTIFY, 1, [libnotify is available on this machine]) + AC_DEFINE([HAVE_LIBNOTIFY],[1],[libnotify is available on this machine]) fi -dnl ******************************* -dnl Internationalization -dnl ******************************* +# ******************************* +# Debug +# ******************************* + +GNOME_DEBUG_CHECK +GNOME_COMPILE_WARNINGS([maximum]) + +# ******************************* +# Internationalization +# ******************************* GETTEXT_PACKAGE=zenity -AC_SUBST(GETTEXT_PACKAGE) -AM_GLIB_GNU_GETTEXT +AC_SUBST([GETTEXT_PACKAGE]) +AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext domain]) -dnl ************************************************************** -dnl AM_GLIB_GNU_GETTEXT above substs $DATADIRNAME -dnl this is the directory where the *.{mo,gmo} files are installed -dnl ************************************************************** +AM_GLIB_GNU_GETTEXT -zenitylocaledir='${prefix}/${DATADIRNAME}/locale' -AC_SUBST(zenitylocaledir) +# ******************************* -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Finding gettext package]) +AC_SUBST([AM_CPPFLAGS]) +AC_SUBST([AM_CFLAGS]) +AC_SUBST([AM_LDFLAGS]) -AC_DEFINE_UNQUOTED(GNOME_ICONDIR, "${prefix}/share/pixmaps", [Determining icon location]) +# ******************************* -AC_OUTPUT([ +AC_CONFIG_FILES([ Makefile zenity.spec po/Makefile.in @@ -75,3 +76,5 @@ src/gdialog data/Makefile help/Makefile ]) + +AC_OUTPUT diff --git a/data/Makefile.am b/data/Makefile.am index 5ee58f29..cc185118 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -6,7 +6,7 @@ clothes_DATA = \ surfboard.png \ hawaii-shirt.png -imagesdir = $(datadir)/zenity/ +imagesdir = $(datadir)/zenity images_DATA = \ zenity.png \ zenity-calendar.png \ diff --git a/po/.cvsignore b/po/.cvsignore index 1fea9c62..8796baa0 100644 --- a/po/.cvsignore +++ b/po/.cvsignore @@ -11,3 +11,4 @@ po2tbl.sed po2tbl.sed.in messages missing +stamp-it diff --git a/src/Makefile.am b/src/Makefile.am index e3c62d53..192dc3b5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -15,21 +15,31 @@ zenity_SOURCES = \ text.c \ progress.c \ tree.c \ - notification.c \ - eggtrayicon.c \ eggtrayicon.h \ + eggtrayicon.c \ + notification.c \ about.c \ util.h \ util.c -INCLUDES = \ - $(ZENITY_CFLAGS) \ +zenity_CPPFLAGS = \ -I$(includedir) \ - -DGNOMELOCALEDIR=\""$(zenitylocaledir)"\" \ - -DZENITY_DATADIR=\""$(datadir)/zenity"\" + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DZENITY_DATADIR=\""$(pkgdatadir)"\" \ + $(AM_CPPFLAGS) + +zenity_CFLAGS = \ + $(ZENITY_CFLAGS) \ + $(LIBNOTIFY_CFLAGS) \ + $(WARN_CFLAGS) \ + $(AM_CFLAGS) + +zenity_LDFLAGS = \ + $(AM_LDFLAGS) zenity_LDADD = \ $(ZENITY_LIBS) \ + $(LIBNOTIFY_LIBS) \ $(X_LIBS) gladedir = $(datadir)/zenity |