Move parser of struct sigevent to a separate file

[strace] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6cc0a086ab90a85a166b3349e0118414fff6d3e5..2870f5dbd02247a0d97a673b821e43db7dc97084 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -87,8 +87,9 @@ strace_SOURCES =      \
        mknod.c         \
        mount.c         \
        mpers_type.h    \
-       mq.c    \
+       mq.c            \
        mtd.c           \
+       native_defs.h   \
        net.c           \
        open.c          \
        or1k_atomic.c   \
@@ -99,6 +100,7 @@ strace_SOURCES =     \
        prctl.c         \
        print_mq_attr.c \
        print_msgbuf.c  \
+       print_sigevent.c \
        print_time.c    \
        printmode.c     \
        printrusage.c   \
@@ -658,6 +660,7 @@ ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioc
 
 BUILT_SOURCES = $(ioctlent_h) native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h .version
 CLEANFILES    = $(ioctlent_h) native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h
+DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h
 
 # defines mpers_source_files
 include mpers.am
@@ -685,6 +688,9 @@ m%_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; \
        done > $@-t
+       echo '#undef MPERS_PRINTER_NAME' >> $@-t
+       echo '#define MPERS_PRINTER_NAME(printer_name) printer_name' >> $@-t
+       echo '#include "$(mpers_PREFIX)printer_decls.h"' >> $@-t
        mv $@-t $@
 
 m%_funcs.h: $(srcdir_mpers_source_files)
@@ -700,9 +706,11 @@ printers.h: $(srcdir_mpers_source_files)
        echo '/* Generated by Makefile from $^; do not edit. */' > $@-t
        echo 'typedef struct {' >> $@-t
        for f in $^; do \
-               sed -n 's/^MPERS_PRINTER_DECL(\([^,]\+\),[[:space:]]*\([^)]\+\))\(.*\)/ \1 (*\2) \3;/p' $$f || exit; \
+               sed -n 's/^MPERS_PRINTER_DECL(\([^,]\+\),[[:space:]]*\([^)]\+\))\(.*\)/ \1 (*\2) \3;\n#define \2 MPERS_PRINTER_NAME(\2)\n/p' $$f || exit; \
        done >> $@-t
        echo '} struct_printers;' >> $@-t
+       echo 'extern const struct_printers *printers;' >> $@-t
+       echo '#define MPERS_PRINTER_NAME(printer_name) printers->printer_name' >> $@-t
        mv $@-t $@
 
 %_printer_decls.h: $(srcdir_mpers_source_files)