Commit 6cbd29169badcfd42dcae78fb5180bb6456bcd0e
2013-10-01T00:20:34
Revert libusb Makefile changes from going to libusbx.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41
diff --git a/compat/libusb-1.0/Makefile.am b/compat/libusb-1.0/Makefile.am
index 0155625..3f1e7d2 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)
+