summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu.herrb@laas.fr>2007-07-30 21:07:05 +0200
committerMatthieu Herrb <matthieu@bluenote.herrb.com>2007-07-30 21:07:05 +0200
commitf479fd29a876d445291d7e55de9e9a22bac419b6 (patch)
treeb08046516e54b4d359f234ce84c45081321b92fc
parent382e52e07a110628efa0784b64088f6f64ae3112 (diff)
- renamed .cvsignore -> .gitignore
- Replace static ChangeLog with disthook to generate from git log
-rw-r--r--.gitignore (renamed from .cvsignore)5
-rw-r--r--ChangeLog31
-rw-r--r--Makefile.am11
3 files changed, 13 insertions, 34 deletions
diff --git a/.cvsignore b/.gitignore
index d998a5e..b599625 100644
--- a/.cvsignore
+++ b/.gitignore
@@ -12,8 +12,9 @@ config.status
config.sub
configure
depcomp
+iceauth
+iceauth.1
install-sh
missing
stamp-h1
-xsetroot
-xsetroot.1
+*~
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index a7722ec..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,31 +0,0 @@
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version for X11R7 release.
-
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for final X11R7 release candidate.
-
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
-
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC3 release.
-
-2005-11-20 Alan Coopersmith <alan.coopersmith@sun.com>
-
- * configure.ac:
- Change dependency from xmu to xmuu since the full xmu
- (with all its baggage like Xt) is not needed here.
-
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for RC1 release.
-
diff --git a/Makefile.am b/Makefile.am
index 5ff96b7..6e1bacf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,9 +35,18 @@ appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-EXTRA_DIST = $(appman_PRE)
+EXTRA_DIST = $(appman_PRE) ChangeLog autogen.sh
CLEANFILES = $(appman_DATA)
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ (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
+
SED = sed
# Strings to replace in man pages