]> granicus.if.org Git - strace/blobdiff - Makefile.am
tests: check decoding of prctl PR_GET_TID_ADDRESS operation
[strace] / Makefile.am
index 9241e1e7978607f5179d0995e3360fcee9c2a476..4840b93771fa634da507c6dedf79899e23e127d0 100644 (file)
@@ -53,6 +53,9 @@ AM_CPPFLAGS = -I$(builddir)/$(OS)/$(ARCH) \
              -I$(builddir) \
              -I$(srcdir)
 
+AM_CFLAGS_FOR_BUILD = $(WARN_CFLAGS_FOR_BUILD)
+AM_CPPFLAGS_FOR_BUILD = $(AM_CPPFLAGS)
+
 include xlat/Makemodule.am
 
 strace_CPPFLAGS = $(AM_CPPFLAGS)
@@ -66,11 +69,14 @@ libstrace_a_CFLAGS = $(strace_CFLAGS)
 libstrace_a_SOURCES =  \
        fstatfs.c \
        fstatfs64.c \
+       ipc.c \
+       socketcall.c \
        statfs.c \
        statfs64.c \
        sync_file_range.c \
        sync_file_range2.c \
        upeek.c         \
+       upoke.c         \
        # end of libstrace_a_SOURCES
 
 strace_SOURCES =       \
@@ -95,12 +101,12 @@ strace_SOURCES =   \
        desc.c          \
        dirent.c        \
        dirent64.c      \
+       dm.c            \
        empty.h         \
        epoll.c         \
        evdev.c         \
        eventfd.c       \
        execve.c        \
-       exit.c          \
        fadvise.c       \
        fallocate.c     \
        fanotify.c      \
@@ -110,8 +116,9 @@ strace_SOURCES =    \
        fetch_struct_flock.c \
        fetch_struct_mmsghdr.c \
        fetch_struct_msghdr.c \
+       fetch_struct_stat.c \
+       fetch_struct_stat64.c \
        fetch_struct_statfs.c \
-       file.c          \
        file_handle.c   \
        file_ioctl.c    \
        fs_x_ioctl.c    \
@@ -145,6 +152,7 @@ strace_SOURCES =    \
        link.c          \
        linux/asm_stat.h \
        linux/x32/asm_stat.h \
+       linux/x86_64/asm_stat.h \
        lookup_dcookie.c \
        loop.c          \
        lseek.c         \
@@ -152,6 +160,7 @@ strace_SOURCES =    \
        membarrier.c    \
        memfd_create.c  \
        mknod.c         \
+       mmsghdr.c       \
        mount.c         \
        mpers_type.h    \
        mq.c            \
@@ -160,29 +169,37 @@ strace_SOURCES =  \
        mtd.c           \
        native_defs.h   \
        net.c           \
+       netlink.c       \
+       nsig.h          \
        numa.c          \
+       oldstat.c       \
        open.c          \
        or1k_atomic.c   \
        pathtrace.c     \
        perf.c          \
+       perf_event_struct.h \
        personality.c   \
+       pkeys.c         \
        poll.c          \
        prctl.c         \
        print_mq_attr.c \
        print_msgbuf.c  \
        print_sigevent.c \
        print_statfs.c  \
+       print_struct_stat.c \
        print_time.c    \
+       print_timespec.c \
+       print_timeval.c \
        print_timex.c   \
        printmode.c     \
        printrusage.c   \
        printsiginfo.c  \
        printsiginfo.h  \
-       printstat.h     \
        process.c       \
        process_vm.c    \
        ptp.c           \
        ptrace.h        \
+       qualify.c       \
        quota.c         \
        readahead.c     \
        readlink.c      \
@@ -205,6 +222,9 @@ strace_SOURCES =    \
        sockaddr.c      \
        socketutils.c   \
        sram_alloc.c    \
+       stat.c          \
+       stat.h          \
+       stat64.c        \
        statfs.c        \
        statfs.h        \
        strace.c        \
@@ -246,7 +266,7 @@ endif
 @CODE_COVERAGE_RULES@
 CODE_COVERAGE_BRANCH_COVERAGE = 1
 CODE_COVERAGE_GENHTML_OPTIONS = $(CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT) \
-       --prefix $(shell realpath -Ls $(abs_top_srcdir)/..)
+       --prefix $(shell cd $(abs_top_srcdir)/.. && pwd || echo .)
 CODE_COVERAGE_IGNORE_PATTERN = '/usr/include/*'
 strace_CPPFLAGS += $(CODE_COVERAGE_CPPFLAGS)
 strace_CFLAGS += $(CODE_COVERAGE_CFLAGS)
@@ -281,6 +301,7 @@ EXTRA_DIST =                                \
        generate_sen.sh                 \
        ioctlsort.c                     \
        linux/32/ioctls_inc.h           \
+       linux/32/ioctls_inc_align16.h   \
        linux/32/ioctls_inc_align32.h   \
        linux/32/ioctls_inc_align64.h   \
        linux/32/syscallent.h           \
@@ -297,6 +318,8 @@ EXTRA_DIST =                                \
        linux/aarch64/ioctls_arch1.h    \
        linux/aarch64/ioctls_inc0.h     \
        linux/aarch64/ioctls_inc1.h     \
+       linux/aarch64/set_error.c       \
+       linux/aarch64/set_scno.c        \
        linux/aarch64/signalent1.h      \
        linux/aarch64/syscallent.h      \
        linux/aarch64/syscallent1.h     \
@@ -311,6 +334,8 @@ EXTRA_DIST =                                \
        linux/alpha/get_syscall_result.c\
        linux/alpha/ioctls_arch0.h      \
        linux/alpha/ioctls_inc0.h       \
+       linux/alpha/set_error.c         \
+       linux/alpha/set_scno.c          \
        linux/alpha/signalent.h         \
        linux/alpha/syscallent.h        \
        linux/alpha/userent.h           \
@@ -320,6 +345,8 @@ EXTRA_DIST =                                \
        linux/arc/get_syscall_args.c    \
        linux/arc/ioctls_arch0.h        \
        linux/arc/ioctls_inc0.h         \
+       linux/arc/set_error.c           \
+       linux/arc/set_scno.c            \
        linux/arc/syscallent.h          \
        linux/arch_regs.h               \
        linux/arch_sigreturn.c          \
@@ -331,6 +358,8 @@ EXTRA_DIST =                                \
        linux/arm/get_syscall_args.c    \
        linux/arm/ioctls_arch0.h        \
        linux/arm/ioctls_inc0.h         \
+       linux/arm/set_error.c           \
+       linux/arm/set_scno.c            \
        linux/arm/syscallent.h          \
        linux/arm/userent.h             \
        linux/avr32/arch_regs.c         \
@@ -339,6 +368,8 @@ EXTRA_DIST =                                \
        linux/avr32/get_syscall_args.c  \
        linux/avr32/ioctls_arch0.h      \
        linux/avr32/ioctls_inc0.h       \
+       linux/avr32/set_error.c         \
+       linux/avr32/set_scno.c          \
        linux/avr32/syscallent.h        \
        linux/avr32/userent.h           \
        linux/bfin/arch_regs.c          \
@@ -348,6 +379,8 @@ EXTRA_DIST =                                \
        linux/bfin/get_syscall_result.c \
        linux/bfin/ioctls_arch0.h       \
        linux/bfin/ioctls_inc0.h        \
+       linux/bfin/set_error.c          \
+       linux/bfin/set_scno.c           \
        linux/bfin/syscallent.h         \
        linux/bfin/userent.h            \
        linux/crisv10/arch_regs.c       \
@@ -356,6 +389,9 @@ EXTRA_DIST =                                \
        linux/crisv10/get_scno.c        \
        linux/crisv10/get_syscall_args.c        \
        linux/crisv10/get_syscall_result.c      \
+       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_sigreturn.c  \
@@ -363,9 +399,13 @@ EXTRA_DIST =                               \
        linux/crisv32/get_scno.c        \
        linux/crisv32/get_syscall_args.c        \
        linux/crisv32/get_syscall_result.c      \
+       linux/crisv32/set_error.c       \
+       linux/crisv32/set_scno.c        \
+       linux/crisv32/syscallent.h      \
        linux/crisv32/userent.h         \
        linux/dummy.h                   \
        linux/errnoent.h                \
+       linux/getregs_old.h             \
        linux/hppa/arch_regs.c          \
        linux/hppa/arch_regs.h          \
        linux/hppa/errnoent.h           \
@@ -375,6 +415,8 @@ EXTRA_DIST =                                \
        linux/hppa/get_syscall_result.c \
        linux/hppa/ioctls_arch0.h       \
        linux/hppa/ioctls_inc0.h        \
+       linux/hppa/set_error.c          \
+       linux/hppa/set_scno.c           \
        linux/hppa/signalent.h          \
        linux/hppa/syscallent.h         \
        linux/i386/arch_regs.c          \
@@ -385,6 +427,8 @@ EXTRA_DIST =                                \
        linux/i386/get_syscall_args.c   \
        linux/i386/ioctls_arch0.h       \
        linux/i386/ioctls_inc0.h        \
+       linux/i386/set_error.c          \
+       linux/i386/set_scno.c           \
        linux/i386/syscallent.h         \
        linux/i386/userent.h            \
        linux/i386/userent0.h           \
@@ -397,17 +441,21 @@ EXTRA_DIST =                              \
        linux/ia64/get_syscall_args.c   \
        linux/ia64/ioctls_arch0.h       \
        linux/ia64/ioctls_inc0.h        \
+       linux/ia64/set_error.c          \
+       linux/ia64/set_scno.c           \
        linux/ia64/syscallent.h         \
        linux/ia64/userent.h            \
        linux/inet_diag.h               \
        linux/m68k/arch_regs.c          \
+       linux/m68k/arch_regs.h          \
        linux/m68k/arch_sigreturn.c     \
        linux/m68k/get_error.c          \
        linux/m68k/get_scno.c           \
        linux/m68k/get_syscall_args.c   \
-       linux/m68k/get_syscall_result.c \
        linux/m68k/ioctls_arch0.h       \
        linux/m68k/ioctls_inc0.h        \
+       linux/m68k/set_error.c          \
+       linux/m68k/set_scno.c           \
        linux/m68k/syscallent.h         \
        linux/m68k/userent.h            \
        linux/metag/arch_regs.c         \
@@ -416,6 +464,8 @@ EXTRA_DIST =                                \
        linux/metag/get_syscall_args.c  \
        linux/metag/ioctls_arch0.h      \
        linux/metag/ioctls_inc0.h       \
+       linux/metag/set_error.c         \
+       linux/metag/set_scno.c          \
        linux/metag/syscallent.h        \
        linux/microblaze/arch_regs.c    \
        linux/microblaze/arch_sigreturn.c       \
@@ -425,6 +475,8 @@ EXTRA_DIST =                                \
        linux/microblaze/get_syscall_result.c   \
        linux/microblaze/ioctls_arch0.h \
        linux/microblaze/ioctls_inc0.h  \
+       linux/microblaze/set_error.c    \
+       linux/microblaze/set_scno.c     \
        linux/microblaze/syscallent.h   \
        linux/microblaze/userent.h      \
        linux/mips/arch_getrval2.c      \
@@ -438,6 +490,8 @@ EXTRA_DIST =                                \
        linux/mips/get_syscall_args.c   \
        linux/mips/ioctls_arch0.h       \
        linux/mips/ioctls_inc0.h        \
+       linux/mips/set_error.c          \
+       linux/mips/set_scno.c           \
        linux/mips/signalent.h          \
        linux/mips/syscallent-compat.h  \
        linux/mips/syscallent-n32.h     \
@@ -453,6 +507,8 @@ EXTRA_DIST =                                \
        linux/nios2/get_syscall_args.c  \
        linux/nios2/ioctls_arch0.h      \
        linux/nios2/ioctls_inc0.h       \
+       linux/nios2/set_error.c         \
+       linux/nios2/set_scno.c          \
        linux/nios2/syscallent.h        \
        linux/or1k/arch_regs.c          \
        linux/or1k/get_error.c          \
@@ -460,6 +516,8 @@ EXTRA_DIST =                                \
        linux/or1k/get_syscall_args.c   \
        linux/or1k/ioctls_arch0.h       \
        linux/or1k/ioctls_inc0.h        \
+       linux/or1k/set_error.c          \
+       linux/or1k/set_scno.c           \
        linux/or1k/syscallent.h         \
        linux/or1k/userent.h            \
        linux/personality.h             \
@@ -471,8 +529,11 @@ EXTRA_DIST =                               \
        linux/powerpc/get_scno.c        \
        linux/powerpc/get_syscall_args.c        \
        linux/powerpc/getregs_old.c     \
+       linux/powerpc/getregs_old.h     \
        linux/powerpc/ioctls_arch0.h    \
        linux/powerpc/ioctls_inc0.h     \
+       linux/powerpc/set_error.c       \
+       linux/powerpc/set_scno.c        \
        linux/powerpc/syscallent.h      \
        linux/powerpc/userent.h         \
        linux/powerpc64/arch_regs.c     \
@@ -484,15 +545,32 @@ EXTRA_DIST =                              \
        linux/powerpc64/get_scno.c      \
        linux/powerpc64/get_syscall_args.c      \
        linux/powerpc64/getregs_old.c   \
+       linux/powerpc64/getregs_old.h   \
        linux/powerpc64/ioctls_arch0.h  \
        linux/powerpc64/ioctls_arch1.h  \
        linux/powerpc64/ioctls_inc0.h   \
        linux/powerpc64/ioctls_inc1.h   \
+       linux/powerpc64/set_error.c     \
+       linux/powerpc64/set_scno.c      \
        linux/powerpc64/signalent1.h    \
        linux/powerpc64/syscallent.h    \
        linux/powerpc64/syscallent1.h   \
        linux/powerpc64/userent.h       \
        linux/ptp_clock.h               \
+       linux/riscv/arch_regs.c         \
+       linux/riscv/errnoent1.h         \
+       linux/riscv/get_error.c         \
+       linux/riscv/get_scno.c          \
+       linux/riscv/get_syscall_args.c  \
+       linux/riscv/ioctls_arch0.h      \
+       linux/riscv/ioctls_arch1.h      \
+       linux/riscv/ioctls_inc0.h       \
+       linux/riscv/ioctls_inc1.h       \
+       linux/riscv/set_error.c         \
+       linux/riscv/set_scno.c          \
+       linux/riscv/signalent1.h        \
+       linux/riscv/syscallent.h        \
+       linux/riscv/syscallent1.h       \
        linux/s390/arch_regs.c          \
        linux/s390/arch_regs.h          \
        linux/s390/arch_sigreturn.c     \
@@ -501,6 +579,8 @@ EXTRA_DIST =                                \
        linux/s390/get_syscall_args.c   \
        linux/s390/ioctls_arch0.h       \
        linux/s390/ioctls_inc0.h        \
+       linux/s390/set_error.c          \
+       linux/s390/set_scno.c           \
        linux/s390/syscallent.h         \
        linux/s390/userent.h            \
        linux/s390/userent0.h           \
@@ -513,6 +593,8 @@ EXTRA_DIST =                                \
        linux/s390x/get_syscall_args.c  \
        linux/s390x/ioctls_arch0.h      \
        linux/s390x/ioctls_inc0.h       \
+       linux/s390x/set_error.c         \
+       linux/s390x/set_scno.c          \
        linux/s390x/syscallent.h        \
        linux/s390x/userent.h           \
        linux/sh/arch_getrval2.c        \
@@ -523,6 +605,8 @@ EXTRA_DIST =                                \
        linux/sh/get_syscall_result.c   \
        linux/sh/ioctls_arch0.h         \
        linux/sh/ioctls_inc0.h          \
+       linux/sh/set_error.c            \
+       linux/sh/set_scno.c             \
        linux/sh/syscallent.h           \
        linux/sh/userent.h              \
        linux/sh/userent0.h             \
@@ -534,6 +618,8 @@ EXTRA_DIST =                                \
        linux/sh64/get_syscall_result.c \
        linux/sh64/ioctls_arch0.h       \
        linux/sh64/ioctls_inc0.h        \
+       linux/sh64/set_error.c          \
+       linux/sh64/set_scno.c           \
        linux/sh64/syscallent.h         \
        linux/sh64/userent.h            \
        linux/signalent.h               \
@@ -549,6 +635,8 @@ EXTRA_DIST =                                \
        linux/sparc/get_syscall_args.c  \
        linux/sparc/ioctls_arch0.h      \
        linux/sparc/ioctls_inc0.h       \
+       linux/sparc/set_error.c         \
+       linux/sparc/set_scno.c          \
        linux/sparc/signalent.h         \
        linux/sparc/syscallent.h        \
        linux/sparc/userent.h           \
@@ -565,6 +653,8 @@ EXTRA_DIST =                                \
        linux/sparc64/ioctls_arch1.h    \
        linux/sparc64/ioctls_inc0.h     \
        linux/sparc64/ioctls_inc1.h     \
+       linux/sparc64/set_error.c       \
+       linux/sparc64/set_scno.c        \
        linux/sparc64/signalent.h       \
        linux/sparc64/signalent1.h      \
        linux/sparc64/syscallent.h      \
@@ -583,6 +673,8 @@ EXTRA_DIST =                                \
        linux/tile/ioctls_arch1.h       \
        linux/tile/ioctls_inc0.h        \
        linux/tile/ioctls_inc1.h        \
+       linux/tile/set_error.c          \
+       linux/tile/set_scno.c           \
        linux/tile/signalent1.h         \
        linux/tile/syscallent.h         \
        linux/tile/syscallent1.h        \
@@ -602,6 +694,8 @@ EXTRA_DIST =                                \
        linux/x32/ioctls_arch1.h        \
        linux/x32/ioctls_inc0.h         \
        linux/x32/ioctls_inc1.h         \
+       linux/x32/set_error.c           \
+       linux/x32/set_scno.c            \
        linux/x32/signalent1.h          \
        linux/x32/syscallent.h          \
        linux/x32/syscallent1.h         \
@@ -616,12 +710,15 @@ EXTRA_DIST =                              \
        linux/x86_64/get_scno.c         \
        linux/x86_64/get_syscall_args.c \
        linux/x86_64/getregs_old.c      \
+       linux/x86_64/getregs_old.h      \
        linux/x86_64/ioctls_arch0.h     \
        linux/x86_64/ioctls_arch1.h     \
        linux/x86_64/ioctls_arch2.h     \
        linux/x86_64/ioctls_inc0.h      \
        linux/x86_64/ioctls_inc1.h      \
        linux/x86_64/ioctls_inc2.h      \
+       linux/x86_64/set_error.c        \
+       linux/x86_64/set_scno.c         \
        linux/x86_64/signalent1.h       \
        linux/x86_64/signalent2.h       \
        linux/x86_64/syscallent.h       \
@@ -635,6 +732,8 @@ EXTRA_DIST =                                \
        linux/xtensa/get_syscall_result.c       \
        linux/xtensa/ioctls_arch0.h     \
        linux/xtensa/ioctls_inc0.h      \
+       linux/xtensa/set_error.c        \
+       linux/xtensa/set_scno.c         \
        linux/xtensa/syscallent.h       \
        linux/xtensa/userent.h          \
        maint/ioctls_gen.sh             \
@@ -655,6 +754,9 @@ EXTRA_DIST =                                \
        xlat/gen.sh                     \
        xlate.el
 
+.PHONY: check-valgrind-local
+check-valgrind-local:
+
 .PHONY: srpm
 srpm: dist-xz
        rpmbuild --define '%_srcrpmdir .' -ts $(distdir).tar.xz
@@ -698,9 +800,9 @@ news-check: NEWS
 ioctlsort_CC = $(CC_FOR_BUILD)
 ioctlsort_DEFS = $(DEFS)
 ioctlsort_INCLUDES = $(DEFAULT_INCLUDES) $(INCLUDES)
-ioctlsort_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_FOR_BUILD)
-ioctlsort_CFLAGS = $(AM_CFLAGS) $(CFLAGS_FOR_BUILD)
-ioctlsort_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD)
+ioctlsort_CPPFLAGS = $(AM_CPPFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD)
+ioctlsort_CFLAGS = $(AM_CFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD)
+ioctlsort_LDFLAGS = $(AM_LDFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD)
 
 ioctls_inc_h = $(wildcard $(srcdir)/$(OS)/$(ARCH)/ioctls_inc*.h)
 ioctlent_h = $(patsubst $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%,ioctlent%,$(ioctls_inc_h))
@@ -709,7 +811,7 @@ ioctl_redefs_h = $(filter-out ioctl_redefs0.h,$(subst ioctlent,ioctl_redefs,$(io
 ioctl_redefs%.h: ioctlent%.h ioctlent0.h
        sort $< > $<-t
        sort ioctlent0.h | comm -23 $<-t - | \
-               sed -n 's/^{ "\([^"]\+\)", \(0x[[:xdigit:]]\+\) },$$/#ifdef \1\n# undef \1\n# define \1 \2\n#endif/p' \
+               sed -r -n 's/^\{ "([^"]+)", (0x[[:xdigit:]]+) \},$$/#ifdef \1\n# undef \1\n# define \1 \2\n#endif/p' \
                > $@-t
        rm -f $<-t
        mv $@-t $@
@@ -750,7 +852,7 @@ libmpers_CFLAGS = $(strace_CFLAGS)
 
 mpers-m%.stamp: $(srcdir_mpers_source_files) | printers.h
        for f in $^; do \
-               CC="$(CC)" CFLAGS="$(mpers_sh_opts)" \
+               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; \
        done
@@ -758,7 +860,7 @@ mpers-m%.stamp: $(srcdir_mpers_source_files) | printers.h
 
 m%_type_defs.h: $(srcdir_mpers_source_files)
        for f in $^; do \
-               sed -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/^#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
@@ -768,7 +870,7 @@ m%_type_defs.h: $(srcdir_mpers_source_files)
 
 m%_funcs.h: $(srcdir_mpers_source_files)
        for f in $^; do \
-               sed -n 's/^SYS_FUNC(\([^)]\+\))/#undef sys_\1\n#define sys_\1 $(mpers_PREFIX)sys_\1/p' $$f || exit; \
+               sed -r -n 's/^SYS_FUNC\(([^)]+)\)/#undef sys_\1\n#define sys_\1 $(mpers_PREFIX)sys_\1/p' $$f || exit; \
        done > $@-t && \
        echo '#include "sys_func.h"' >> $@-t
        mv $@-t $@
@@ -778,13 +880,13 @@ m%_funcs.h: $(srcdir_mpers_source_files)
 %.c.mpers.i: $(srcdir)/%.c
        $(CPP) -P $(mpers_sh_opts) -DIN_MPERS_BOOTSTRAP $< -o $@
 
-mpers_printer_decl_pattern = ^MPERS_PRINTER_DECL(\([^,)]\+\),[[:space:]]*\([^,)]\+\),[[:space:]]*\([^)]\+\))$$
+mpers_printer_decl_pattern = ^MPERS_PRINTER_DECL\(([^,)]+),[[:space:]]*([^,)]+),[[:space:]]*([^)]+)\)$$
 
 printers.h: $(mpers_preproc_files)
        echo '/* Generated by Makefile from $^; do not edit. */' > $@-t
        echo 'typedef struct {' >> $@-t
        for f in $^; do \
-               sed -n 's/$(mpers_printer_decl_pattern)/ \1 (*\2)(\3);\n#define \2 MPERS_PRINTER_NAME(\2)\n/p' $$f \
+               sed -r -n 's/$(mpers_printer_decl_pattern)/ \1 (*\2)(\3);\n#define \2 MPERS_PRINTER_NAME(\2)\n/p' $$f \
                || exit; \
        done >> $@-t
        echo '} struct_printers;' >> $@-t
@@ -795,7 +897,7 @@ printers.h: $(mpers_preproc_files)
 %_printer_decls.h: $(mpers_preproc_files)
        echo '/* Generated by Makefile from $^; do not edit. */' > $@-t
        for f in $^; do \
-               sed -n 's/$(mpers_printer_decl_pattern)/extern \1 $(mpers_PREFIX)\2(\3);/p' $$f \
+               sed -r -n 's/$(mpers_printer_decl_pattern)/extern \1 $(mpers_PREFIX)\2(\3);/p' $$f \
                || exit; \
        done >> $@-t
        mv $@-t $@
@@ -803,7 +905,7 @@ printers.h: $(mpers_preproc_files)
 %_printer_defs.h: $(mpers_preproc_files)
        echo '/* Generated by Makefile from $^; do not edit. */' > $@-t
        for f in $^; do \
-               sed -n 's/$(mpers_printer_decl_pattern)/\.\2 = $(mpers_PREFIX)\2,/p' $$f \
+               sed -r -n 's/$(mpers_printer_decl_pattern)/.\2 = $(mpers_PREFIX)\2,/p' $$f \
                || exit; \
        done >> $@-t
        mv $@-t $@
@@ -865,7 +967,7 @@ $(srcdir)/CREDITS: $(srcdir)/CREDITS.in $(srcdir)/.mailmap \
        (                                                               \
          cd $(srcdir);                                                 \
          sed '/^##/,$$d' CREDITS.in;                                   \
-         { sed -n '1,/^##>/d; s/  \+/\t/; s/^./&/p' 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)}';             \