]> granicus.if.org Git - strace/blobdiff - Makefile.am
Unify different generic PRINT_FIELD_* implementations
[strace] / Makefile.am
index 2b01d3dc472dcb604332ec7862e8d889ad934e75..7c0658d5babdaa48c9cc9eb39b3dbddf341f85af 100644 (file)
@@ -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
@@ -70,6 +71,7 @@ libstrace_a_SOURCES = \
        fstatfs.c \
        fstatfs64.c \
        ipc.c \
+       sigreturn.c     \
        socketcall.c \
        statfs.c \
        statfs64.c \
@@ -102,6 +104,7 @@ strace_SOURCES =    \
        dirent.c        \
        dirent64.c      \
        dm.c            \
+       dyxlat.c        \
        empty.h         \
        epoll.c         \
        evdev.c         \
@@ -170,6 +173,12 @@ strace_SOURCES =   \
        native_defs.h   \
        net.c           \
        netlink.c       \
+       netlink.h       \
+       netlink_sock_diag.c \
+       nlattr.c        \
+       nlattr.h        \
+       nsfs.c          \
+       nsfs.h          \
        nsig.h          \
        numa.c          \
        oldstat.c       \
@@ -183,8 +192,10 @@ strace_SOURCES =   \
        poll.c          \
        prctl.c         \
        print_dev_t.c   \
+       print_fields.h  \
        print_mq_attr.c \
        print_msgbuf.c  \
+       print_sg_req_info.c \
        print_sigevent.c \
        print_statfs.c  \
        print_struct_stat.c \
@@ -208,17 +219,21 @@ strace_SOURCES =  \
        regs.h          \
        renameat.c      \
        resource.c      \
+       rt_sigframe.c   \
+       rt_sigreturn.c  \
        rtc.c           \
        sched.c         \
+       sched_attr.h    \
        scsi.c          \
        seccomp.c       \
        seccomp_fprog.h \
        sendfile.c      \
+       sg_io_v3.c      \
+       sg_io_v4.c      \
        sigaltstack.c   \
        sigevent.h      \
        signal.c        \
        signalfd.c      \
-       sigreturn.c     \
        sock.c          \
        sockaddr.c      \
        socketutils.c   \
@@ -228,10 +243,13 @@ strace_SOURCES =  \
        stat64.c        \
        statfs.c        \
        statfs.h        \
+       statx.c         \
+       statx.h         \
        strace.c        \
        swapon.c        \
        syscall.c       \
        sysctl.c        \
+       sysent.h        \
        sysinfo.c       \
        syslog.c        \
        sysmips.c       \
@@ -246,13 +264,14 @@ strace_SOURCES =  \
        umount.c        \
        uname.c         \
        userfaultfd.c   \
+       ustat.c         \
        util.c          \
        utime.c         \
        utimes.c        \
        v4l2.c          \
-       vsprintf.c      \
        wait.c          \
        xattr.c         \
+       xlat.c          \
        xlat.h          \
        xmalloc.c       \
        # end of strace_SOURCES
@@ -298,8 +317,8 @@ EXTRA_DIST =                                \
        debian/strace64.install         \
        debian/strace64.manpages        \
        debian/watch                    \
-       errnoent.sh                     \
        generate_sen.sh                 \
+       ioctl_iocdef.c                  \
        ioctlsort.c                     \
        linux/32/ioctls_inc.h           \
        linux/32/ioctls_inc_align16.h   \
@@ -310,6 +329,7 @@ EXTRA_DIST =                                \
        linux/64/syscallent.h           \
        linux/aarch64/arch_regs.c       \
        linux/aarch64/arch_regs.h       \
+       linux/aarch64/arch_rt_sigframe.c\
        linux/aarch64/arch_sigreturn.c  \
        linux/aarch64/errnoent1.h       \
        linux/aarch64/get_error.c       \
@@ -327,6 +347,7 @@ EXTRA_DIST =                                \
        linux/alpha/arch_getrval2.c     \
        linux/alpha/arch_regs.c         \
        linux/alpha/arch_regs.h         \
+       linux/alpha/arch_rt_sigframe.c  \
        linux/alpha/arch_sigreturn.c    \
        linux/alpha/errnoent.h          \
        linux/alpha/get_error.c         \
@@ -341,6 +362,8 @@ EXTRA_DIST =                                \
        linux/alpha/syscallent.h        \
        linux/alpha/userent.h           \
        linux/arc/arch_regs.c           \
+       linux/arc/arch_regs.h           \
+       linux/arc/arch_rt_sigframe.c    \
        linux/arc/get_error.c           \
        linux/arc/get_scno.c            \
        linux/arc/get_syscall_args.c    \
@@ -353,6 +376,7 @@ EXTRA_DIST =                                \
        linux/arch_sigreturn.c          \
        linux/arm/arch_regs.c           \
        linux/arm/arch_regs.h           \
+       linux/arm/arch_rt_sigframe.c    \
        linux/arm/arch_sigreturn.c      \
        linux/arm/get_error.c           \
        linux/arm/get_scno.c            \
@@ -364,6 +388,8 @@ EXTRA_DIST =                                \
        linux/arm/syscallent.h          \
        linux/arm/userent.h             \
        linux/avr32/arch_regs.c         \
+       linux/avr32/arch_regs.h         \
+       linux/avr32/arch_rt_sigframe.c  \
        linux/avr32/get_error.c         \
        linux/avr32/get_scno.c          \
        linux/avr32/get_syscall_args.c  \
@@ -374,32 +400,38 @@ EXTRA_DIST =                              \
        linux/avr32/syscallent.h        \
        linux/avr32/userent.h           \
        linux/bfin/arch_regs.c          \
+       linux/bfin/arch_rt_sigframe.c   \
        linux/bfin/get_error.c          \
        linux/bfin/get_scno.c           \
        linux/bfin/get_syscall_args.c   \
        linux/bfin/get_syscall_result.c \
        linux/bfin/ioctls_arch0.h       \
        linux/bfin/ioctls_inc0.h        \
+       linux/bfin/rt_sigframe.h        \
        linux/bfin/set_error.c          \
        linux/bfin/set_scno.c           \
        linux/bfin/syscallent.h         \
        linux/bfin/userent.h            \
        linux/crisv10/arch_regs.c       \
+       linux/crisv10/arch_rt_sigframe.c\
        linux/crisv10/arch_sigreturn.c  \
        linux/crisv10/get_error.c       \
        linux/crisv10/get_scno.c        \
        linux/crisv10/get_syscall_args.c        \
        linux/crisv10/get_syscall_result.c      \
+       linux/crisv10/rt_sigframe.h     \
        linux/crisv10/set_error.c       \
        linux/crisv10/set_scno.c        \
        linux/crisv10/syscallent.h      \
        linux/crisv10/userent.h         \
        linux/crisv32/arch_regs.c       \
+       linux/crisv32/arch_rt_sigframe.c\
        linux/crisv32/arch_sigreturn.c  \
        linux/crisv32/get_error.c       \
        linux/crisv32/get_scno.c        \
        linux/crisv32/get_syscall_args.c        \
        linux/crisv32/get_syscall_result.c      \
+       linux/crisv32/rt_sigframe.h     \
        linux/crisv32/set_error.c       \
        linux/crisv32/set_scno.c        \
        linux/crisv32/syscallent.h      \
@@ -409,6 +441,7 @@ EXTRA_DIST =                                \
        linux/getregs_old.h             \
        linux/hppa/arch_regs.c          \
        linux/hppa/arch_regs.h          \
+       linux/hppa/arch_rt_sigframe.c   \
        linux/hppa/errnoent.h           \
        linux/hppa/get_error.c          \
        linux/hppa/get_scno.c           \
@@ -416,18 +449,21 @@ EXTRA_DIST =                              \
        linux/hppa/get_syscall_result.c \
        linux/hppa/ioctls_arch0.h       \
        linux/hppa/ioctls_inc0.h        \
+       linux/hppa/rt_sigframe.h        \
        linux/hppa/set_error.c          \
        linux/hppa/set_scno.c           \
        linux/hppa/signalent.h          \
        linux/hppa/syscallent.h         \
        linux/i386/arch_regs.c          \
        linux/i386/arch_regs.h          \
+       linux/i386/arch_rt_sigframe.c   \
        linux/i386/arch_sigreturn.c     \
        linux/i386/get_error.c          \
        linux/i386/get_scno.c           \
        linux/i386/get_syscall_args.c   \
        linux/i386/ioctls_arch0.h       \
        linux/i386/ioctls_inc0.h        \
+       linux/i386/rt_sigframe.h        \
        linux/i386/set_error.c          \
        linux/i386/set_scno.c           \
        linux/i386/syscallent.h         \
@@ -436,12 +472,13 @@ EXTRA_DIST =                              \
        linux/ia64/arch_getrval2.c      \
        linux/ia64/arch_regs.c          \
        linux/ia64/arch_regs.h          \
-       linux/ia64/arch_sigreturn.c     \
+       linux/ia64/arch_rt_sigframe.c   \
        linux/ia64/get_error.c          \
        linux/ia64/get_scno.c           \
        linux/ia64/get_syscall_args.c   \
        linux/ia64/ioctls_arch0.h       \
        linux/ia64/ioctls_inc0.h        \
+       linux/ia64/rt_sigframe.h        \
        linux/ia64/set_error.c          \
        linux/ia64/set_scno.c           \
        linux/ia64/syscallent.h         \
@@ -449,17 +486,21 @@ EXTRA_DIST =                              \
        linux/inet_diag.h               \
        linux/m68k/arch_regs.c          \
        linux/m68k/arch_regs.h          \
+       linux/m68k/arch_rt_sigframe.c   \
        linux/m68k/arch_sigreturn.c     \
        linux/m68k/get_error.c          \
        linux/m68k/get_scno.c           \
        linux/m68k/get_syscall_args.c   \
        linux/m68k/ioctls_arch0.h       \
        linux/m68k/ioctls_inc0.h        \
+       linux/m68k/rt_sigframe.h        \
        linux/m68k/set_error.c          \
        linux/m68k/set_scno.c           \
        linux/m68k/syscallent.h         \
        linux/m68k/userent.h            \
        linux/metag/arch_regs.c         \
+       linux/metag/arch_regs.h         \
+       linux/metag/arch_rt_sigframe.c  \
        linux/metag/get_error.c         \
        linux/metag/get_scno.c          \
        linux/metag/get_syscall_args.c  \
@@ -469,6 +510,7 @@ EXTRA_DIST =                                \
        linux/metag/set_scno.c          \
        linux/metag/syscallent.h        \
        linux/microblaze/arch_regs.c    \
+       linux/microblaze/arch_rt_sigframe.c\
        linux/microblaze/arch_sigreturn.c       \
        linux/microblaze/get_error.c    \
        linux/microblaze/get_scno.c     \
@@ -483,6 +525,7 @@ EXTRA_DIST =                                \
        linux/mips/arch_getrval2.c      \
        linux/mips/arch_regs.c          \
        linux/mips/arch_regs.h          \
+       linux/mips/arch_rt_sigframe.c   \
        linux/mips/arch_sigreturn.c     \
        linux/mips/errnoent.h           \
        linux/mips/genstub.sh           \
@@ -491,6 +534,7 @@ EXTRA_DIST =                                \
        linux/mips/get_syscall_args.c   \
        linux/mips/ioctls_arch0.h       \
        linux/mips/ioctls_inc0.h        \
+       linux/mips/rt_sigframe.h        \
        linux/mips/set_error.c          \
        linux/mips/set_scno.c           \
        linux/mips/signalent.h          \
@@ -503,6 +547,8 @@ EXTRA_DIST =                                \
        linux/mtd-abi.h                 \
        linux/netlink_diag.h            \
        linux/nios2/arch_regs.c         \
+       linux/nios2/arch_regs.h         \
+       linux/nios2/arch_rt_sigframe.c  \
        linux/nios2/get_error.c         \
        linux/nios2/get_scno.c          \
        linux/nios2/get_syscall_args.c  \
@@ -512,6 +558,8 @@ EXTRA_DIST =                                \
        linux/nios2/set_scno.c          \
        linux/nios2/syscallent.h        \
        linux/or1k/arch_regs.c          \
+       linux/or1k/arch_regs.h          \
+       linux/or1k/arch_rt_sigframe.c   \
        linux/or1k/get_error.c          \
        linux/or1k/get_scno.c           \
        linux/or1k/get_syscall_args.c   \
@@ -521,9 +569,11 @@ EXTRA_DIST =                               \
        linux/or1k/set_scno.c           \
        linux/or1k/syscallent.h         \
        linux/or1k/userent.h            \
+       linux/packet_diag.h             \
        linux/personality.h             \
        linux/powerpc/arch_regs.c       \
        linux/powerpc/arch_regs.h       \
+       linux/powerpc/arch_rt_sigframe.c\
        linux/powerpc/arch_sigreturn.c  \
        linux/powerpc/errnoent.h        \
        linux/powerpc/get_error.c       \
@@ -539,6 +589,7 @@ EXTRA_DIST =                                \
        linux/powerpc/userent.h         \
        linux/powerpc64/arch_regs.c     \
        linux/powerpc64/arch_regs.h     \
+       linux/powerpc64/arch_rt_sigframe.c\
        linux/powerpc64/arch_sigreturn.c        \
        linux/powerpc64/errnoent.h      \
        linux/powerpc64/errnoent1.h     \
@@ -551,6 +602,7 @@ EXTRA_DIST =                                \
        linux/powerpc64/ioctls_arch1.h  \
        linux/powerpc64/ioctls_inc0.h   \
        linux/powerpc64/ioctls_inc1.h   \
+       linux/powerpc64/rt_sigframe.h   \
        linux/powerpc64/set_error.c     \
        linux/powerpc64/set_scno.c      \
        linux/powerpc64/signalent1.h    \
@@ -559,6 +611,8 @@ EXTRA_DIST =                                \
        linux/powerpc64/userent.h       \
        linux/ptp_clock.h               \
        linux/riscv/arch_regs.c         \
+       linux/riscv/arch_regs.h         \
+       linux/riscv/arch_rt_sigframe.c  \
        linux/riscv/errnoent1.h         \
        linux/riscv/get_error.c         \
        linux/riscv/get_scno.c          \
@@ -572,14 +626,17 @@ EXTRA_DIST =                              \
        linux/riscv/signalent1.h        \
        linux/riscv/syscallent.h        \
        linux/riscv/syscallent1.h       \
+       linux/rt_sigframe.h             \
        linux/s390/arch_regs.c          \
        linux/s390/arch_regs.h          \
+       linux/s390/arch_rt_sigframe.c   \
        linux/s390/arch_sigreturn.c     \
        linux/s390/get_error.c          \
        linux/s390/get_scno.c           \
        linux/s390/get_syscall_args.c   \
        linux/s390/ioctls_arch0.h       \
        linux/s390/ioctls_inc0.h        \
+       linux/s390/rt_sigframe.h        \
        linux/s390/set_error.c          \
        linux/s390/set_scno.c           \
        linux/s390/syscallent.h         \
@@ -588,18 +645,21 @@ EXTRA_DIST =                              \
        linux/s390/userent1.h           \
        linux/s390x/arch_regs.c         \
        linux/s390x/arch_regs.h         \
+       linux/s390x/arch_rt_sigframe.c  \
        linux/s390x/arch_sigreturn.c    \
        linux/s390x/get_error.c         \
        linux/s390x/get_scno.c          \
        linux/s390x/get_syscall_args.c  \
        linux/s390x/ioctls_arch0.h      \
        linux/s390x/ioctls_inc0.h       \
+       linux/s390x/rt_sigframe.h       \
        linux/s390x/set_error.c         \
        linux/s390x/set_scno.c          \
        linux/s390x/syscallent.h        \
        linux/s390x/userent.h           \
        linux/sh/arch_getrval2.c        \
        linux/sh/arch_regs.c            \
+       linux/sh/arch_rt_sigframe.c     \
        linux/sh/get_error.c            \
        linux/sh/get_scno.c             \
        linux/sh/get_syscall_args.c     \
@@ -613,21 +673,25 @@ EXTRA_DIST =                              \
        linux/sh/userent0.h             \
        linux/sh64/arch_regs.c          \
        linux/sh64/arch_regs.h          \
+       linux/sh64/arch_rt_sigframe.c   \
        linux/sh64/get_error.c          \
        linux/sh64/get_scno.c           \
        linux/sh64/get_syscall_args.c   \
        linux/sh64/get_syscall_result.c \
        linux/sh64/ioctls_arch0.h       \
        linux/sh64/ioctls_inc0.h        \
+       linux/sh64/rt_sigframe.h        \
        linux/sh64/set_error.c          \
        linux/sh64/set_scno.c           \
        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         \
        linux/sparc/arch_regs.h         \
+       linux/sparc/arch_rt_sigframe.c  \
        linux/sparc/arch_sigreturn.c    \
        linux/sparc/errnoent.h          \
        linux/sparc/gen.pl              \
@@ -636,6 +700,7 @@ EXTRA_DIST =                                \
        linux/sparc/get_syscall_args.c  \
        linux/sparc/ioctls_arch0.h      \
        linux/sparc/ioctls_inc0.h       \
+       linux/sparc/rt_sigframe.h       \
        linux/sparc/set_error.c         \
        linux/sparc/set_scno.c          \
        linux/sparc/signalent.h         \
@@ -644,6 +709,7 @@ EXTRA_DIST =                                \
        linux/sparc64/arch_getrval2.c   \
        linux/sparc64/arch_regs.c       \
        linux/sparc64/arch_regs.h       \
+       linux/sparc64/arch_rt_sigframe.c\
        linux/sparc64/arch_sigreturn.c  \
        linux/sparc64/errnoent.h        \
        linux/sparc64/errnoent1.h       \
@@ -654,6 +720,7 @@ EXTRA_DIST =                                \
        linux/sparc64/ioctls_arch1.h    \
        linux/sparc64/ioctls_inc0.h     \
        linux/sparc64/ioctls_inc1.h     \
+       linux/sparc64/rt_sigframe.h     \
        linux/sparc64/set_error.c       \
        linux/sparc64/set_scno.c        \
        linux/sparc64/signalent.h       \
@@ -665,6 +732,7 @@ EXTRA_DIST =                                \
        linux/syscall.h                 \
        linux/tile/arch_regs.c          \
        linux/tile/arch_regs.h          \
+       linux/tile/arch_rt_sigframe.c   \
        linux/tile/arch_sigreturn.c     \
        linux/tile/errnoent1.h          \
        linux/tile/get_error.c          \
@@ -674,6 +742,7 @@ EXTRA_DIST =                                \
        linux/tile/ioctls_arch1.h       \
        linux/tile/ioctls_inc0.h        \
        linux/tile/ioctls_inc1.h        \
+       linux/tile/rt_sigframe.h        \
        linux/tile/set_error.c          \
        linux/tile/set_scno.c           \
        linux/tile/signalent1.h         \
@@ -686,6 +755,7 @@ EXTRA_DIST =                                \
        linux/userent0.h                \
        linux/x32/arch_regs.c           \
        linux/x32/arch_regs.h           \
+       linux/x32/arch_rt_sigframe.c    \
        linux/x32/arch_sigreturn.c      \
        linux/x32/errnoent1.h           \
        linux/x32/get_error.c           \
@@ -695,6 +765,7 @@ EXTRA_DIST =                                \
        linux/x32/ioctls_arch1.h        \
        linux/x32/ioctls_inc0.h         \
        linux/x32/ioctls_inc1.h         \
+       linux/x32/rt_sigframe.h         \
        linux/x32/set_error.c           \
        linux/x32/set_scno.c            \
        linux/x32/signalent1.h          \
@@ -703,6 +774,7 @@ EXTRA_DIST =                                \
        linux/x32/userent.h             \
        linux/x86_64/arch_regs.c        \
        linux/x86_64/arch_regs.h        \
+       linux/x86_64/arch_rt_sigframe.c \
        linux/x86_64/arch_sigreturn.c   \
        linux/x86_64/errnoent1.h        \
        linux/x86_64/errnoent2.h        \
@@ -718,6 +790,7 @@ EXTRA_DIST =                                \
        linux/x86_64/ioctls_inc0.h      \
        linux/x86_64/ioctls_inc1.h      \
        linux/x86_64/ioctls_inc2.h      \
+       linux/x86_64/rt_sigframe.h      \
        linux/x86_64/set_error.c        \
        linux/x86_64/set_scno.c         \
        linux/x86_64/signalent1.h       \
@@ -727,6 +800,7 @@ EXTRA_DIST =                                \
        linux/x86_64/syscallent2.h      \
        linux/x86_64/userent.h          \
        linux/xtensa/arch_regs.c        \
+       linux/xtensa/arch_rt_sigframe.c \
        linux/xtensa/get_error.c        \
        linux/xtensa/get_scno.c         \
        linux/xtensa/get_syscall_args.c \
@@ -737,19 +811,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                    \
-       signalent.sh                    \
+       scno.head                       \
        strace-graph                    \
        strace-log-merge                \
        strace.spec                     \
-       syscallent.sh                   \
        $(XLAT_INPUT_FILES)             \
        $(XLAT_HEADER_FILES)            \
        xlat/gen.sh                     \
@@ -784,6 +853,7 @@ sen.h: $(patsubst %,$(srcdir)/%,$(syscallent_files))
 
 dist-hook:
        $(AM_V_GEN)echo $(VERSION) > $(distdir)/.tarball-version
+       ${AM_V_GEN}echo $(COPYRIGHT_YEAR) > $(distdir)/.year
 
 today = $(shell date +%Y-%m-%d)
 version_regexp = $(subst .,\.,$(VERSION))
@@ -820,10 +890,19 @@ ioctl_redefs%.h: ioctlent%.h ioctlent0.h
 ioctlent%.h: ioctlsort%
        ./$< > $@
 
+# Need to pick up <linux/ioctl.h> definitions *for host* while compiling
+# ioctlsort *for build*, hence this magic.
+ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c
+       $(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+               $(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@
+
+ioctl_iocdef.h: ioctl_iocdef.i
+       sed -n 's/^DEFINE HOST/#define /p' $< > $@
+
 ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o
        $(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@
 
-ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c
+ioctlsort%.o: ioctls_all%.h ioctl_iocdef.h $(srcdir)/ioctlsort.c
        $(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c
 
 ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h
@@ -832,9 +911,14 @@ ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioc
 BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) \
                native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h .version
 CLEANFILES    = $(ioctl_redefs_h) $(ioctlent_h) $(mpers_preproc_files) \
+               ioctl_iocdef.h ioctl_iocdef.i \
                native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h
 DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h
 
+include scno.am
+
+$(strace_OBJECTS): scno.h
+
 # defines mpers_source_files
 include mpers.am
 srcdir_mpers_source_files = $(patsubst %,$(srcdir)/%,$(mpers_source_files))
@@ -861,7 +945,7 @@ mpers-m%.stamp: $(srcdir_mpers_source_files) | printers.h
 
 m%_type_defs.h: $(srcdir_mpers_source_files)
        for f in $^; do \
-               sed -r -n 's/^#include DEF_MPERS_TYPE\(([^)]+)\)/#ifdef MPERS_$(mpers_PREFIX)\1\n# define \1 MPERS_$(mpers_PREFIX)\1\n#endif/p' $$f || exit; \
+               sed -r -n 's/^#[[:space:]]*include DEF_MPERS_TYPE\(([^)]+)\)/#ifdef MPERS_$(mpers_PREFIX)\1\n# define \1 MPERS_$(mpers_PREFIX)\1\n#endif/p' $$f || exit; \
        done > $@-t
        echo '#undef MPERS_PRINTER_NAME' >> $@-t
        echo '#define MPERS_PRINTER_NAME(printer_name) printer_name' >> $@-t