[PATCH 2/2] Autotools: fix make distcheck and add ChangeLog

[Pete Batard]

Proposed changes for the make distcheck issue reported by Ludovic.

I tested that make distcheck seems to work fine with MinGW, so I'm 
obviously going to use that instead of a custom script to produce the 
RC5 tarball.

Eventually, I'll also fix 'make dist-up' from Makefile.am for upload 
automation.

Regards,

/Pete



-------------- next part --------------
From e2e27b3b415ced4936c46c7735ff7e54c2b74367 Mon Sep 17 00:00:00 2001
From: Pete Batard <pete at akeo.ie>
Date: Fri, 30 Mar 2012 13:05:12 +0100
Subject: [PATCH 2/2] Autotools: fix make distcheck and add ChangeLog

---
 .gitignore  |    1 -
 ChangeLog   |    5 +++++
 Makefile.am |    7 +------
 3 files changed, 6 insertions(+), 7 deletions(-)
 create mode 100644 ChangeLog

diff --git a/.gitignore b/.gitignore
index 4ac3f2f..e17bc30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,7 +30,6 @@ dpfp
 dpfp_threaded
 *.exe
 *.pc
-ChangeLog
 doc/html
 *.plg
 *.ncb
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..7465d9e
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,5 @@
+For the latest change log, please visit:
+http://libusbx.git.sourceforge.net/git/gitweb.cgi?p=libusbx/libusbx;a=log
+
+Alternatively, if you have retrieved the libusbx git repository, you can simply
+navigate to it and issue the command 'git log'.
diff --git a/Makefile.am b/Makefile.am
index f59b8c3..6b1074e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,6 @@
 AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
 ACLOCAL_AMFLAGS = -I m4
 DISTCLEANFILES = libusb-1.0.pc
-MAINTAINERCLEANFILES = ChangeLog
 EXTRA_DIST = TODO PORTING
 SUBDIRS = libusb doc
 
@@ -12,11 +11,7 @@ endif
 pkgconfigdir=$(libdir)/pkgconfig
 pkgconfig_DATA=libusb-1.0.pc
 
-.PHONY: ChangeLog dist-up
-ChangeLog:
-	git --git-dir $(top_srcdir)/.git log > ChangeLog || touch ChangeLog
-
-dist-hook: ChangeLog
+.PHONY: dist-up
 
 reldir = .release/$(distdir)
 dist-up: dist
-- 
1.7.9.msysgit.0