Use O_CLOEXEC for internal file descriptors

[android-x86/external-libpciaccess.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 214721b..fc47966 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# 
+#
 # (C) Copyright IBM Corporation 2006
 # All Rights Reserved.
 #
@@ -21,19 +21,23 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
-SUBDIRS = src
+# Include autoconf macros from m4 subdir
+ACLOCAL_AMFLAGS = -I m4
+
+# Order: scanpci depends on libpciaccess built in src
+SUBDIRS = include man src scanpci
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = pciaccess.pc
 
-EXTRA_DIST = pciaccess.pc.in autogen.sh src/scanpci.c
+MAINTAINERCLEANFILES = ChangeLog INSTALL
 
-EXTRA_DIST += ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
+.PHONY: ChangeLog INSTALL
 
-.PHONY: ChangeLog
+INSTALL:
+       $(INSTALL_CMD)
 
 ChangeLog:
-       (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+       $(CHANGELOG_CMD)
 
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL