[Xfce4-commits] <xfce4-smartbookmark-plugin:master> Clean up and modernize the build system

Florian Rivoal noreply at xfce.org
Tue Nov 1 14:52:04 CET 2011


Updating branch refs/heads/master
         to 6a79553608693a7fd4cc1faff72df45d1a560684 (commit)
       from 195f3ba726afeab794a305d763fa91376aabe748 (commit)

commit 6a79553608693a7fd4cc1faff72df45d1a560684
Author: Florian Rivoal <frivoal at gmail.com>
Date:   Tue Nov 1 06:27:31 2011 -0700

    Clean up and modernize the build system

 Makefile.am                     |   12 ++-
 autogen.sh                      |   15 ++--
 configure.ac => configure.ac.in |    2 +-
 po/ChangeLog                    |  190 ---------------------------------------
 po/LINGUAS                      |    2 -
 5 files changed, 16 insertions(+), 205 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 8fccda8..ba79fa8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,12 +4,18 @@ SUBDIRS = \
 	po \
 	src
 
-AUTOMAKE_OPTIONS = \
-        dist-bzip2
-
 distclean-local:
 		rm -rf *.cache *~ 
 
+.PHONY: ChangeLog
+
+ChangeLog: Makefile
+	(GIT_DIR=$(top_srcdir)/.git git log > .changelog.tmp \
+	&& mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) \
+	|| (touch ChangeLog; echo 'Git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
+
 EXTRA_DIST = \
         README \
         intltool-extract.in \
diff --git a/autogen.sh b/autogen.sh
index 143e1ca..6bc0c8a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,23 +1,20 @@
 #!/bin/sh
 #
-# $Id: autogen.sh 4312 2005-01-27 10:10:04Z jasper $
-#
-# Copyright (c) 2002-2005
+# Copyright (c) 2002-2009
 #         The Xfce development team. All rights reserved.
 #
 # Written for Xfce by Benedikt Meurer <benny at xfce.org>.
-#
+
+export XDT_AUTOGEN_REQUIRED_VERSION="4.7.0"
 
 (type xdt-autogen) >/dev/null 2>&1 || {
   cat >&2 <<EOF
 autogen.sh: You don't seem to have the Xfce development tools installed on
             your system, which are required to build this software.
-            Please install the xfce4-dev-tools package first, it is available
-            from http://www.xfce.org/.
+            Please install the xfce4-dev-tools package first, available from
+            http://xfce.org/~benny/projects/xfce4-dev-tools/.
 EOF
   exit 1
 }
 
-exec xdt-autogen $@
-
-# vi:set ts=2 sw=2 et ai:
+xdt-autogen $@
diff --git a/configure.ac b/configure.ac.in
similarity index 95%
rename from configure.ac
rename to configure.ac.in
index cb344f5..67b0c73 100644
--- a/configure.ac
+++ b/configure.ac.in
@@ -20,7 +20,7 @@ AC_PROG_LIBTOOL()
 AC_PROG_INTLTOOL()
 
 dnl Check for i18n support
-XDT_I18N([ca cs en_GB eu fr hu it pl pt_PT sq zh_TW])
+XDT_I18N([@LINGUAS@])
 
 dnl Check for required packages
 XDT_CHECK_LIBX11_REQUIRE()
diff --git a/po/ChangeLog b/po/ChangeLog
deleted file mode 100644
index b5540e3..0000000
--- a/po/ChangeLog
+++ /dev/null
@@ -1,190 +0,0 @@
-2009-08-08  Mike Massonnet <mmassonnet at xfce.org>
-
-	* ast.po: Asturian translation added (Marcos Alvarez Costales)
-
-2009-07-24  Gabor Kelemen  <kelemeng at gnome.hu>
-
-	* hu.po: Translation reworked.
-
-2009-05-29  Mike Massonnet <mmassonnet at xfce.org>
-
-	* ur_PK.po: Urdu Pakistan translation update (Muhammad Ali Makki)
-	* ur.po: Urdu translation update (Muhammad Ali Makki)
-	* zh_CN.po: Simplified Chinese translation update (Hunt Xu)
-
-2009-04-16  Mike Massonnet <mmassonnet at xfce.org>
-
-	* gl.po: Galician translation update (Leandro Regueiro)
-
-2009-03-14  Maximilian Schleiss <maximilian at xfce.org>
-
-	* gl.po: Galician translation update (Leandro Regueiro)
-
-2009-03-05  Mike Massonnet <mmassonnet at xfce.org>
-
-	* pt.po: Renamed pt_PT.po to pt.po (bug #4574)
-
-2009-02-22  Mike Massonnet <mmassonnet at xfce.org>
-
-	* es.po: Add Spanish translation (Abel Martín)
-
-2009-02-20  Maximilian Schleiss <maximilian at xfce.org>
-
-	* gl.po: Galician translation update (Leandro Regueiro)
-
-2008-12-20  Alexander Toresson <eulex at xfce.org>
-
-	* sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
-
-2008-11-17  Eren Türkay <erenturkay at xfce.org>
-
-        * tr.po: Turkish translation update (Turkish translation team: Gökmen Görgen, Samed Beyribey, Özgür Kuru, Utku Aydın)
-
-2008-11-16  Maximilian Schleiss <maximilian at xfce.org>
-
-	* ca.po: Catalan translation update (Carles Muñoz Gorriz)
-
-2008-11-13 Og Maciel <ogmaciel at gnome.org>
-
-	* pt_BR.po: Updated Brazilian Portuguese translation by
-	Vladimir Melo.
-
-2008-11-12  Piarres Beobide <pi at beobide.net>
-
-        * eu.po: Basque translation update
-
-2008-11-09  Maximilian Schleiss <maximilian at xfce.org>
-
-	* sq.po: Albanian translation update (Besnik Bleta)
-
-2008-11-01  Michal Várady <miko.vaji at gmail.com>
-
-	* cs.po: Czech translation updated
-
-2008-10-10  Maximilian Schleiss <maximilian at xfce.org>
-
-	* ja.po: Japanese translation update (Nobuhiro Iwamatsu)
-
-2008-10-05  Maximilian Schleiss <maximilian at xfce.org>
-
-	* pt_PT.po: European Portuguese translation update (Nuno Miguel)
-
-2008-10-02  Lars Nielsen <lars at mit-web.dk>
-
-	* da.po: Danish translation update
-
-2008-09-15  Piarres Beobide <pi at beobide.net>
-
-        * eu.po: Basque translation update
-
-2008-09-11  Piarres Beobide <pi at beobide.net>
-
-	* eu.po: Basque translation update
-
-2008-09-08  Maximilian Schleiss <maximilian at xfce.org>
-
-	* id.po: Indonesian translation update (Andhika Padmawan)
-
-2008-07-27 Og Maciel <ogmaciel at gnome.org>
-
-    * *.po, *.pot: Update message catalogs and template
-    * pt_BR.po: Updated Brazilian Portuguese translation
-
-2008-07-15 Mohamed Magdy <alnokta at xfce.org>
-
-        * ar.po: Add Arabic translation
-
-2008-06-26  Maximilian Schleiss <maximilian at xfce.org>
-
-	* gl.po, LINGUAS: Galician translation added (Leandro Regueiro)
-
-2008-06-25  Maximilian Schleiss <maximilian at xfce.org>
-
-	* id.po, LINGUAS: Indonesian translation added (Andhika Padmawan)
-
-2008-05-27  Mike Massonnet <mmassonnet at xfce.org>
-
-	* da.po, LINGUAS: Add Danish translation (Jens Hyllegaard)
-
-2008-05-14	Mike Massonnet <mmassonnet at xfce.org>
-
-	* ja.po: Update Japanese translation (Nobuhiro Iwamatsu)
-
-2007-11-18	Maximilian Schleiss <maximilian at xfce.org>
-
-	* lv.po: Latvian translation added
-	by Rihards Priedītis <rprieditis at inbox.lv>
-
-2007-11-15	Mike Massonnet <mmassonnet at xfce.org>
-
-	* ur.po: Update translation by Muhammad Ali Makki <makki.ma at gmail.com>
-	* pk.po, ur.po: Rename pk.po to ur.po.
-
-2007-11-03  Maximilian Schleiss <maximilian at xfce.org>
-
-	* it.po:  Italian translation update
-	by Fabio Riga <usul at aruba.it>
-
-2007-10-28	Mike Massonnet <mmassonnet at xfce.org>
-
-	* pk.po: Add new translation by محمد علي المكي <makki.ma at gmail.com>
-
-2007-09-07  Og Maciel <ogmaciel at gnome.org>
-
-	* pt_BR.po: Brazilian Protuguese translation added
-	by Vladimir Melo <vladimirmelo at foresightlinux.org>
-
-2007-07-08	Maximilian Schleiss <maximilian at xfce.org>
-
-	* pt_PT.po: European Protuguese translation added
-	by Nuno Miguel <nunis at netcabo.pt>
-
-2007-04-01	Maximilian Schleiss <maximilian at xfce.org>
-
-	* pl.po: Small fixes to the Polish translation
-	by Piotr Maliński <riklaunim at gmail.com>
-
-2007-03-31	Pau Rul-lan Ferragut <paurullan at bulma.net>
-
-	* gb.po: British translation
-	by Jeff Bailes <thepizzaking at gmail.com>
-
-2007-02-20	 Maximilian Schleiss <maximilian at xfce.org>
-
-	* sq.po: Modified the headers for the Albanian translation
-	by Besnik Bleta <besnik at programeshqip.org>
-
-2007-02-02	 Maximilian Schleiss <maximilian at xfce.org>
-
-	* fr.po: Added the Albanian translation
-	by Besnik Bleta <besnik at programeshqip.org>
-
-2006-10-26	Piarres Beobide <pi at beobide.net>
-
-	* eu.po: Add Basque translation.
-
-2006-09-18	Pau Rul-lan Ferragut <paurullan at bulma.net>
-
-	* ca.po: Add Catalan translation.
-
-2006-09-06	Hydonsingore Cia <hydonsingore at educities.edu.tw>
-
-	* zh_TW.po: Updated traditional Chinese translations.
-
-2006-09-03	Jean-François Wauthy <pollux at xfce.org>
-
-	* pl.po: Add Polish translations
-
-2006-08-27  Jean-François Wauthy <pollux at xfce.org>
-
-	* cs.po: Add Czech translations
-
-2006-08-19  Jean-François Wauthy <pollux at xfce.org>
-
-	* fr.po: Updated French translations by Max Schleiss
-
-2006-07-28  Hydonsingore Cia <hydonsingore at educities.edu.tw>
-
-	* zh_TW.po: Added traditional Chinese translations by
-	  Cosmo Chene <cosmolax at gmail.com>.
-
diff --git a/po/LINGUAS b/po/LINGUAS
deleted file mode 100644
index 60fb421..0000000
--- a/po/LINGUAS
+++ /dev/null
@@ -1,2 +0,0 @@
-# set of available languages (in alphabetic order)
-ar ast ca cs da de en_GB es eu fr gl hu id it ja lv pl pt_BR pt sq sv tr uk ur ur_PK zh_CN zh_TW 


More information about the Xfce4-commits mailing list