core: Suppress hotplug events during initial enumeration

[platform/upstream/libusb.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3db0b72..09d7cf5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,28 +1,50 @@
 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
+EXTRA_DIST = INSTALL_WIN.txt PORTING doc/libusb.png \
+            android msvc Xcode
+SUBDIRS = libusb
 
 if BUILD_EXAMPLES
 SUBDIRS += examples
 endif
 
-pkgconfigdir=$(libdir)/pkgconfig
-pkgconfig_DATA=libusb-1.0.pc
+if BUILD_TESTS
+SUBDIRS += tests
+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
+# The package name is libusb-1.0, but we want the distribution
+# to be created as libusb-x.y.z instead of libusb-1.0-x.y.z
+distdir = libusb-$(VERSION)
 
-dist-hook: ChangeLog
+# Ensure any generated docs are cleaned out
+# We need this here because make does not recurse into doc/
+clean-local:
+       rm -rf doc/$(DOXYGEN_HTMLDIR)
+
+# Use dist-hook to accomplish the following things for the dist recipe:
+#   1) Remove the GitHub Markdown from the README file
+#   2) Remove the .gitattributes file from the msvc directory
+dist-hook:
+       chmod u+w $(distdir)/README $(distdir)/msvc
+       $(SED) -i.orig -e '/Build Status/d' $(distdir)/README
+       $(SED) -i.orig -e '/^$$/N;/^\n$$/D' $(distdir)/README
+       $(SED) -i.orig -e 's/\[\([A-Z]*\)\](\1)/\1/' $(distdir)/README
+       rm -f $(distdir)/README.orig
+       rm -f $(distdir)/msvc/.gitattributes
 
 reldir = .release/$(distdir)
-dist-up: dist
+sfurl = frs.sourceforge.net:/home/frs/project/libusb/libusb-1.0
+.PHONY: dist-upload
+dist-upload: dist
        rm -rf $(reldir)
        mkdir -p $(reldir)
        cp $(distdir).tar.bz2 $(reldir)
-       rsync -rv $(reldir) dsd_,libusb@frs.sourceforge.net:/home/frs/project/l/li/libusb/libusb-1.0/
+       if [ -z "$$SF_USER" ]; then \
+               rsync -rv $(reldir) $(sfurl); \
+       else \
+               rsync -rv $(reldir) $$SF_USER@$(sfurl); \
+       fi
        rm -rf $(reldir)
-