X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=Makefile.am;h=dd1536c5ce73aa83332d971fd6503c088cd7eab7;hb=558ece68c8faf7ee0d480ccda52c5c60c62fe5bf;hp=e5a9447460537753275ccc4386e59c63fa9d9c0e;hpb=31601155c46c28694060e3f6d6709e42bc0b5be3;p=strace

diff --git a/Makefile.am b/Makefile.am
index e5a94474..dd1536c5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,6 +4,7 @@
 # Copyright (c) 2006-2016 Dmitry V. Levin <ldv@altlinux.org>
 # Copyright (c) 2008-2015 Mike Frysinger <vapier@gentoo.org>
 # Copyright (c) 2015 Elvira Khabirova <lineprinter0@gmail.com>
+# Copyright (c) 2002-2017 The strace developers.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -34,16 +35,18 @@ endif
 if HAVE_MX32_RUNTIME
 TESTS_MX32 = tests-mx32
 endif
-SUBDIRS = tests $(TESTS_M32) $(TESTS_MX32)
+SUBDIRS = . tests $(TESTS_M32) $(TESTS_MX32)
 
 bin_PROGRAMS = strace
-man_MANS = strace.1
+man_MANS = strace.1 strace-log-merge.1
 bin_SCRIPTS = strace-graph strace-log-merge
 
 OS		= linux
 # ARCH is `i386', `m68k', `sparc', etc.
 ARCH		= @arch@
 
+READELF		= @READELF@
+
 ACLOCAL_AMFLAGS = -I m4
 AM_CFLAGS = $(WARN_CFLAGS)
 AM_CPPFLAGS = -I$(builddir)/$(OS)/$(ARCH) \
@@ -70,6 +73,7 @@ libstrace_a_SOURCES =	\
 	fstatfs.c \
 	fstatfs64.c \
 	ipc.c \
+	sigreturn.c	\
 	socketcall.c \
 	statfs.c \
 	statfs64.c \
@@ -84,9 +88,16 @@ strace_SOURCES =	\
 	affinity.c	\
 	aio.c		\
 	alpha.c		\
+	basic_filters.c	\
+	bind.c		\
 	bjm.c		\
 	block.c		\
 	bpf.c		\
+	bpf_filter.c	\
+	bpf_filter.h	\
+	bpf_fprog.h 	\
+	bpf_seccomp_filter.c \
+	bpf_sock_filter.c \
 	btrfs.c		\
 	cacheflush.c	\
 	capability.c	\
@@ -102,8 +113,11 @@ strace_SOURCES =	\
 	dirent.c	\
 	dirent64.c	\
 	dm.c		\
+	dyxlat.c	\
 	empty.h		\
 	epoll.c		\
+	error_prints.c	\
+	error_prints.h	\
 	evdev.c		\
 	eventfd.c	\
 	execve.c	\
@@ -112,8 +126,9 @@ strace_SOURCES =	\
 	fanotify.c	\
 	fchownat.c	\
 	fcntl.c		\
-	fetch_seccomp_fprog.c \
+	fetch_bpf_fprog.c \
 	fetch_struct_flock.c \
+	fetch_struct_keyctl_kdf_params.c \
 	fetch_struct_mmsghdr.c \
 	fetch_struct_msghdr.c \
 	fetch_struct_stat.c \
@@ -121,9 +136,11 @@ strace_SOURCES =	\
 	fetch_struct_statfs.c \
 	file_handle.c	\
 	file_ioctl.c	\
-	fs_x_ioctl.c	\
+	filter_qualify.c \
+	filter.h	\
 	flock.c		\
 	flock.h		\
+	fs_x_ioctl.c	\
 	futex.c		\
 	gcc_compat.h	\
 	get_robust_list.c \
@@ -148,14 +165,18 @@ strace_SOURCES =	\
 	kernel_types.h	\
 	kexec.c		\
 	keyctl.c	\
+	keyctl_kdf_params.h \
+	kvm.c \
 	ldt.c		\
 	link.c		\
 	linux/asm_stat.h \
 	linux/x32/asm_stat.h \
 	linux/x86_64/asm_stat.h \
+	listen.c	\
 	lookup_dcookie.c \
 	loop.c		\
 	lseek.c		\
+	macros.h	\
 	mem.c		\
 	membarrier.c	\
 	memfd_create.c	\
@@ -168,10 +189,29 @@ strace_SOURCES =	\
 	msghdr.h	\
 	mtd.c		\
 	native_defs.h	\
+	negated_errno.h	\
 	net.c		\
 	netlink.c       \
+	netlink.h	\
+	netlink_crypto.c \
+	netlink_sock_diag.h \
+	netlink_inet_diag.c \
+	netlink_netlink_diag.c \
+	netlink_packet_diag.c \
+	netlink_route.c	\
+	netlink_route.h	\
+	netlink_selinux.c \
+	netlink_smc_diag.c \
+	netlink_sock_diag.c \
+	netlink_unix_diag.c \
+	nlattr.c	\
+	nlattr.h	\
+	nsfs.c          \
+	nsfs.h          \
 	nsig.h		\
 	numa.c		\
+	number_set.c	\
+	number_set.h	\
 	oldstat.c	\
 	open.c		\
 	or1k_atomic.c	\
@@ -183,6 +223,9 @@ strace_SOURCES =	\
 	poll.c		\
 	prctl.c		\
 	print_dev_t.c	\
+	print_group_req.c \
+	print_fields.h	\
+	print_ifindex.c	\
 	print_mq_attr.c	\
 	print_msgbuf.c	\
 	print_sg_req_info.c \
@@ -201,7 +244,6 @@ strace_SOURCES =	\
 	process_vm.c	\
 	ptp.c		\
 	ptrace.h	\
-	qualify.c	\
 	quota.c		\
 	readahead.c	\
 	readlink.c	\
@@ -212,19 +254,31 @@ strace_SOURCES =	\
 	rt_sigframe.c	\
 	rt_sigreturn.c	\
 	rtc.c		\
+	rtnl_addr.c	\
+	rtnl_addrlabel.c \
+	rtnl_dcb.c	\
+	rtnl_link.c	\
+	rtnl_mdb.c	\
+	rtnl_neigh.c	\
+	rtnl_neightbl.c	\
+	rtnl_netconf.c	\
+	rtnl_nsid.c	\
+	rtnl_route.c	\
+	rtnl_rule.c	\
+	rtnl_tc.c	\
+	rtnl_tc_action.c \
 	sched.c		\
 	sched_attr.h	\
 	scsi.c		\
 	seccomp.c	\
-	seccomp_fprog.h \
 	sendfile.c	\
 	sg_io_v3.c	\
 	sg_io_v4.c	\
+	shutdown.c	\
 	sigaltstack.c	\
 	sigevent.h	\
 	signal.c	\
 	signalfd.c	\
-	sigreturn.c	\
 	sock.c		\
 	sockaddr.c	\
 	socketutils.c	\
@@ -234,19 +288,28 @@ strace_SOURCES =	\
 	stat64.c	\
 	statfs.c	\
 	statfs.h	\
+	statx.c		\
+	statx.h		\
 	strace.c	\
+	string_to_uint.h \
+	string_to_uint.c \
+	supported_personalities.h \
 	swapon.c	\
 	syscall.c	\
 	sysctl.c	\
 	sysent.h	\
+	sysent_shorthand_defs.h \
+	sysent_shorthand_undefs.h \
 	sysinfo.c	\
 	syslog.c	\
 	sysmips.c	\
 	term.c		\
 	time.c		\
 	times.c		\
+	trace_event.h	\
 	truncate.c	\
 	ubi.c		\
+	ucopy.c		\
 	uid.c		\
 	uid16.c		\
 	umask.c		\
@@ -260,8 +323,11 @@ strace_SOURCES =	\
 	v4l2.c		\
 	wait.c		\
 	xattr.c		\
+	xlat.c		\
 	xlat.h		\
 	xmalloc.c	\
+	xmalloc.h	\
+	xstring.h	\
 	# end of strace_SOURCES
 
 if USE_LIBUNWIND
@@ -269,6 +335,11 @@ strace_SOURCES += unwind.c
 strace_CPPFLAGS += $(libunwind_CPPFLAGS)
 strace_LDFLAGS += $(libunwind_LDFLAGS)
 strace_LDADD += $(libunwind_LIBS)
+if USE_DEMANGLE
+strace_CPPFLAGS += $(libiberty_CPPFLAGS)
+strace_LDFLAGS += $(libiberty_LDFLAGS)
+strace_LDADD += $(libiberty_LIBS)
+endif
 endif
 
 @CODE_COVERAGE_RULES@
@@ -278,7 +349,7 @@ CODE_COVERAGE_GENHTML_OPTIONS = $(CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT) \
 CODE_COVERAGE_IGNORE_PATTERN = '/usr/include/*'
 strace_CPPFLAGS += $(CODE_COVERAGE_CPPFLAGS)
 strace_CFLAGS += $(CODE_COVERAGE_CFLAGS)
-strace_LDADD += $(CODE_COVERAGE_LDFLAGS)
+strace_LDADD += $(CODE_COVERAGE_LIBS)
 
 # Enable this to get link map generated
 #strace_LDFLAGS += -Wl,-Map=strace.mapfile
@@ -305,7 +376,6 @@ EXTRA_DIST =				\
 	debian/strace64.install		\
 	debian/strace64.manpages	\
 	debian/watch			\
-	errnoent.sh			\
 	generate_sen.sh			\
 	ioctl_iocdef.c			\
 	ioctlsort.c			\
@@ -361,6 +431,7 @@ EXTRA_DIST =				\
 	linux/arc/set_error.c		\
 	linux/arc/set_scno.c		\
 	linux/arc/syscallent.h		\
+	linux/arch_kvm.c		\
 	linux/arch_regs.h		\
 	linux/arch_sigreturn.c		\
 	linux/arm/arch_regs.c		\
@@ -443,6 +514,7 @@ EXTRA_DIST =				\
 	linux/hppa/set_scno.c		\
 	linux/hppa/signalent.h		\
 	linux/hppa/syscallent.h		\
+	linux/i386/arch_kvm.c		\
 	linux/i386/arch_regs.c		\
 	linux/i386/arch_regs.h		\
 	linux/i386/arch_rt_sigframe.c	\
@@ -462,7 +534,6 @@ EXTRA_DIST =				\
 	linux/ia64/arch_regs.c		\
 	linux/ia64/arch_regs.h		\
 	linux/ia64/arch_rt_sigframe.c	\
-	linux/ia64/arch_sigreturn.c	\
 	linux/ia64/get_error.c		\
 	linux/ia64/get_scno.c		\
 	linux/ia64/get_syscall_args.c	\
@@ -534,7 +605,6 @@ EXTRA_DIST =				\
 	linux/mips/syscallent-o32.h	\
 	linux/mips/syscallent.h		\
 	linux/mips/userent.h		\
-	linux/mtd-abi.h			\
 	linux/netlink_diag.h		\
 	linux/nios2/arch_regs.c		\
 	linux/nios2/arch_regs.h		\
@@ -559,7 +629,7 @@ EXTRA_DIST =				\
 	linux/or1k/set_scno.c		\
 	linux/or1k/syscallent.h		\
 	linux/or1k/userent.h		\
-	linux/personality.h		\
+	linux/packet_diag.h		\
 	linux/powerpc/arch_regs.c	\
 	linux/powerpc/arch_regs.h	\
 	linux/powerpc/arch_rt_sigframe.c\
@@ -598,7 +668,6 @@ EXTRA_DIST =				\
 	linux/powerpc64/syscallent.h	\
 	linux/powerpc64/syscallent1.h	\
 	linux/powerpc64/userent.h	\
-	linux/ptp_clock.h		\
 	linux/riscv/arch_regs.c		\
 	linux/riscv/arch_regs.h		\
 	linux/riscv/arch_rt_sigframe.c	\
@@ -675,6 +744,7 @@ EXTRA_DIST =				\
 	linux/sh64/syscallent.h		\
 	linux/sh64/userent.h		\
 	linux/signalent.h		\
+	linux/smc_diag.h		\
 	linux/sock_diag.h		\
 	linux/sparc/arch_getrval2.c	\
 	linux/sparc/arch_regs.c		\
@@ -737,10 +807,10 @@ EXTRA_DIST =				\
 	linux/tile/syscallent.h		\
 	linux/tile/syscallent1.h	\
 	linux/tile/userent.h		\
-	linux/ubi-user.h		\
 	linux/unix_diag.h		\
 	linux/userent.h			\
 	linux/userent0.h		\
+	linux/x32/arch_kvm.c		\
 	linux/x32/arch_regs.c		\
 	linux/x32/arch_regs.h		\
 	linux/x32/arch_rt_sigframe.c	\
@@ -760,6 +830,7 @@ EXTRA_DIST =				\
 	linux/x32/syscallent.h		\
 	linux/x32/syscallent1.h		\
 	linux/x32/userent.h		\
+	linux/x86_64/arch_kvm.c		\
 	linux/x86_64/arch_regs.c	\
 	linux/x86_64/arch_regs.h	\
 	linux/x86_64/arch_rt_sigframe.c	\
@@ -799,20 +870,14 @@ EXTRA_DIST =				\
 	linux/xtensa/set_scno.c		\
 	linux/xtensa/syscallent.h	\
 	linux/xtensa/userent.h		\
-	maint/ioctls_gen.sh		\
-	maint/ioctls_hex.sh		\
-	maint/ioctls_sym.sh		\
-	maint/print_ioctlent.c		\
 	mpers.awk			\
 	mpers.sh			\
 	mpers_test.sh			\
 	mpers_xlat.h			\
 	scno.head			\
-	signalent.sh			\
 	strace-graph			\
 	strace-log-merge		\
 	strace.spec			\
-	syscallent.sh			\
 	$(XLAT_INPUT_FILES)		\
 	$(XLAT_HEADER_FILES)		\
 	xlat/gen.sh			\
@@ -847,6 +912,8 @@ sen.h: $(patsubst %,$(srcdir)/%,$(syscallent_files))
 
 dist-hook:
 	$(AM_V_GEN)echo $(VERSION) > $(distdir)/.tarball-version
+	${AM_V_GEN}echo $(COPYRIGHT_YEAR) > $(distdir)/.year
+	${AM_V_GEN}echo $(MANPAGE_DATE) > $(distdir)/.strace.1.in.date
 
 today = $(shell date +%Y-%m-%d)
 version_regexp = $(subst .,\.,$(VERSION))
@@ -930,9 +997,12 @@ libmpers_CFLAGS = $(strace_CFLAGS)
 
 mpers-m%.stamp: $(srcdir_mpers_source_files) | printers.h
 	for f in $^; do \
-		CC="$(CC)" CFLAGS="$(mpers_sh_opts) -DMPERS_IS_$(mpers_NAME)" \
-		CPP="$(CPP)" CPPFLAGS="$(mpers_sh_opts) -DIN_MPERS -DMPERS_IS_$(mpers_NAME)" \
-		$(srcdir)/mpers.sh -$(mpers_NAME) $$f || exit; \
+		READELF="$(READELF)" \
+		CC="$(CC)" \
+		CFLAGS="$(mpers_sh_opts) -DMPERS_IS_$(mpers_NAME)" \
+		CPP="$(CPP)" \
+		CPPFLAGS="$(mpers_sh_opts) -DIN_MPERS -DMPERS_IS_$(mpers_NAME)" \
+		$(srcdir)/mpers.sh $(mpers_NAME) $(mpers_CC_FLAGS) $$f || exit; \
 	done
 	> $@
 
@@ -1003,6 +1073,7 @@ BUILT_SOURCES += $(mpers_m32_targets)
 CLEANFILES    += $(mpers_m32_targets)
 
 $(mpers_m32_targets): mpers_NAME = m32
+$(mpers_m32_targets): mpers_CC_FLAGS = @cc_flags_m32@
 
 endif # HAVE_M32_MPERS
 
@@ -1019,6 +1090,7 @@ BUILT_SOURCES += $(mpers_mx32_targets)
 CLEANFILES    += $(mpers_mx32_targets)
 
 $(mpers_mx32_targets): mpers_NAME = mx32
+$(mpers_mx32_targets): mpers_CC_FLAGS = @cc_flags_mx32@
 
 endif # HAVE_MX32_MPERS
 
@@ -1045,10 +1117,9 @@ $(srcdir)/CREDITS: $(srcdir)/CREDITS.in $(srcdir)/.mailmap \
 	(								\
 	  cd $(srcdir);							\
 	  sed '/^##/,$$d' CREDITS.in;					\
-	  { sed -n '1,/^##>/d; s/   */\t/; s/^./&/p' CREDITS.in;	\
-	    git log --pretty=format:'%aN	%aE';			\
-	  } | LC_ALL=C sort -u						\
-	    | awk -F'\t' '{printf("\t%s <%s>\n",$$1,$$2)}';		\
+	  sed -n '1,/^##>/d; s/   */\t/; s/^./&/p' CREDITS.in		\
+	    | maint/gen-contributors-list.sh - -e HEAD --initial	\
+	    | sed 's/\t/ /g; s/^/\t/'					\
 	) > $@-t && mv $@-t $@
 
 export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner --mode=go-w,go+rX