summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2009-01-27 20:08:44 -0200
committerPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2009-01-27 20:08:44 -0200
commita0aeb48945773d26f9a033a672eaf6f7917d0b83 (patch)
tree192f3cac6f503d3667fff652a2aaf0f947e1c60e
parent196061a586ed13189b68dec80c86c536ffc37ed7 (diff)
Janitor: Correct make distcheck and dont distribute autogen.sh
-rw-r--r--.gitignore6
-rw-r--r--ChangeLog64
-rw-r--r--Makefile.am11
-rw-r--r--configure.ac4
4 files changed, 19 insertions, 66 deletions
diff --git a/.gitignore b/.gitignore
index 044aa68..1e4c79e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,11 @@ autom4te.cache
config.log
config.status
configure
-fixesext.pc
+fixesproto.pc
install-sh
missing
mkinstalldirs
+*~
+fixesproto-*.tar.*
+ChangeLog
+tags
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 74aa5dc..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,64 +0,0 @@
-2006-3-30 Deron Johnson <deron.johnson@sun.com>
-
- * configure.ac
- * xfixesproto.h
- * xfixeswire.h
- Xfixes Version 4.0: XFixesHideCursor, XFixesShowCursor
-
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for final X11R7 release candidate.
-
-2004-07-26 Keith Packard <keithp@keithp.com>
-
- * configure.ac:
- * xfixesproto.h:
- * xfixeswire.h:
- Add XFixesExpandRegion
-
-2004-02-03 Jim Gettys <jg@freedesktop.org>
-
- * AUTHORS: Add contents to AUTHORS file
-
-2004-01-15 Daniel Stone <daniel@fooishbar.org>
- * Tag release 2.0.1 for first freedesktop.org clientside lib release.
-
-2003-11-21 Keith Packard <keithp@keithp.com>
-
- * protocol:
- * xfixesproto.h:
- * xfixeswire.h:
- Eliminate offset arguments in combining operators,
- create separate CopyRegion and TranslateRegion requests.
-
-2003-11-02 Keith Packard <keithp@keithp.com>
-
- * configure.ac:
- * fixesext.pc.in:
- * protocol:
- * xfixesproto.h:
- * xfixeswire.h:
- Merge xfixes_2_branch back to head
-
-2003-10-19 Keith Packard <keithp@keithp.com>
-
- * configure.ac:
- * fixesext.pc.in:
- * protocol:
- * xfixesproto.h:
- * xfixeswire.h:
- Update to version 2.0.
- Add dependency on xextensions package
- Add region requests and cursor names
-
-
-2003-09-16 Anders Carlsson <andersca@gnome.org>
-
- * configure.ac:
- * randr-uninstalled.pc.in:
- Add uninstalled pc file.
-
-2003-04-21 Keith Packard <keithp@keithp.com>
-
- + Added ChangeLog
diff --git a/Makefile.am b/Makefile.am
index 44a88a9..3b0ff24 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,5 +32,14 @@ fixesdoc_DATA = fixesproto.txt
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = fixesproto.pc
-EXTRA_DIST = autogen.sh fixesproto.pc.in $(fixesdoc_DATA)
+EXTRA_DIST = fixesproto.pc.in $(fixesdoc_DATA)
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 36999d2..4078f49 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,11 @@ AC_INIT([FixesProto], [4.0], [https://bugs.freedesktop.org/enter_bug.cgi?product
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
+# Require xorg-macros: XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile
fixesproto.pc])