From 6cbd29169badcfd42dcae78fb5180bb6456bcd0e Mon Sep 17 00:00:00 2001
From: Con Kolivas <kernel@kolivas.org>
Date: Tue, 1 Oct 2013 00:20:34 +1000
Subject: [PATCH] Revert libusb Makefile changes from going to libusbx.

---
 compat/libusb-1.0/Makefile.am | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/compat/libusb-1.0/Makefile.am b/compat/libusb-1.0/Makefile.am
index 0155625a..3f1e7d20 100644
--- a/compat/libusb-1.0/Makefile.am
+++ b/compat/libusb-1.0/Makefile.am
@@ -1,23 +1,18 @@
 AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
 ACLOCAL_AMFLAGS = -I m4
 DISTCLEANFILES = libusb-1.0.pc
-EXTRA_DIST = TODO PORTING msvc libusb/libusb-1.0.def libusb/version_nano.h \
-  examples/getopt/getopt.c examples/getopt/getopt1.c examples/getopt/getopt.h \
-  android Xcode
-SUBDIRS = libusb doc
-
-if BUILD_EXAMPLES
-SUBDIRS += examples
-endif
-
-if BUILD_TESTS
-SUBDIRS += tests
-endif
+MAINTAINERCLEANFILES = ChangeLog
+EXTRA_DIST = TODO PORTING
+SUBDIRS = libusb
 
 pkgconfigdir=$(libdir)/pkgconfig
 pkgconfig_DATA=libusb-1.0.pc
 
-.PHONY: dist-up
+.PHONY: ChangeLog dist-up
+ChangeLog:
+	git --git-dir $(top_srcdir)/.git log > ChangeLog || touch ChangeLog
+
+dist-hook: ChangeLog
 
 reldir = .release/$(distdir)
 dist-up: dist
@@ -26,3 +21,4 @@ dist-up: dist
 	cp $(distdir).tar.bz2 $(reldir)
 	rsync -rv $(reldir) frs.sourceforge.net:/home/frs/project/l/li/libusb/libusb-1.0/
 	rm -rf $(reldir)
+