Updating branch refs/heads/master
to 392d3f67ccf647b4eb10f769e355c4cc4f4ff8e7 (commit)
from dddb7db21e8c2c8e295504439624f6187a36372f (commit)
commit 392d3f67ccf647b4eb10f769e355c4cc4f4ff8e7
Author: Jérôme Guelfucci <jero...@xfce.org>
Date: Sat Apr 23 09:17:15 2011 +0200
Modernize the root Makefile.am.
Generate changelog on make dist and clean tabs.
Makefile.am | 29 ++++++++++++++++++-----------
po/ChangeLog | 3 ---
po/LINGUAS | 2 --
3 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index de8f5b4..3091092 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,6 @@
-# $Id$
-
-SUBDIRS = \
- icons \
- panel-plugin \
+SUBDIRS = \
+ icons \
+ panel-plugin \
po
distclean-local:
@@ -12,14 +10,23 @@ rpm: dist
rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
@rm -f $(PACKAGE)-$(VERSION).tar.gz
-EXTRA_DIST = \
- intltool-extract.in \
- intltool-merge.in \
+.PHONY: ChangeLog
+
+ChangeLog: Makefile
+ (GIT_DIR=$(top_srcdir)/.git git log xfce-4.6-master..HEAD >
.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 = \
+ intltool-extract.in \
+ intltool-merge.in \
intltool-update.in
-DISTCLEANFILES = \
- intltool-extract \
- intltool-merge \
+DISTCLEANFILES = \
+ intltool-extract \
+ intltool-merge \
intltool-update
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/po/ChangeLog b/po/ChangeLog
deleted file mode 100644
index fc53ca1..0000000
--- a/po/ChangeLog
+++ /dev/null
@@ -1,3 +0,0 @@
-YYYY-MM-DD John Doo <j...@foo.org>
-
- * be.po: Update translations
diff --git a/po/LINGUAS b/po/LINGUAS
deleted file mode 100644
index 1756fb5..0000000
--- a/po/LINGUAS
+++ /dev/null
@@ -1,2 +0,0 @@
-# set of available languages (in alphabetic order)
-
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
