Use automake's '+=' to simplify include_HEADERS rules. Move most EXTRA_DIST files to noinst_HEADERS, eliminating duplication of headers listed by include_HEADERS. Add MIPS and PPC32 headers that were not being distributed previously.
Signed-off-by: Zachary T Welch <[email protected]> --- Makefile.am | 73 +++++++++++++++++++++++++--------------------------------- 1 files changed, 32 insertions(+), 41 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9484c97..1434c0c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,71 +1,62 @@ +include_HEADERS = include/libunwind-dynamic.h include/libunwind-ptrace.h + if ARCH_ARM -include_HEADERS_tdep = include/libunwind-arm.h -else +include_HEADERS += include/libunwind-arm.h +endif if ARCH_IA64 -include_HEADERS_tdep = include/libunwind-ia64.h -else +include_HEADERS += include/libunwind-ia64.h +endif if ARCH_HPPA -include_HEADERS_tdep = include/libunwind-hppa.h -else +include_HEADERS += include/libunwind-hppa.h +endif if ARCH_MIPS -include_HEADERS_tdep = include/libunwind-mips.h -else +include_HEADERS += include/libunwind-mips.h +endif if ARCH_X86 -include_HEADERS_tdep = include/libunwind-x86.h -else +include_HEADERS += include/libunwind-x86.h +endif if ARCH_X86_64 -include_HEADERS_tdep = include/libunwind-x86_64.h -else +include_HEADERS += include/libunwind-x86_64.h +endif if ARCH_PPC32 -include_HEADERS_tdep = include/libunwind-ppc32.h -else +include_HEADERS += include/libunwind-ppc32.h +endif if ARCH_PPC64 -include_HEADERS_tdep = include/libunwind-ppc64.h -endif # ARCH_PPC64 -endif # ARCH_PPC32 -endif # ARCH_X86_64 -endif # ARCH_X86 -endif # ARCH_MIPS -endif # ARCH_HPPA -endif # ARCH_IA64 -endif # ARCH_ARM - -include_HEADERS_common = $(include_HEADERS_tdep) \ - include/libunwind-dynamic.h include/libunwind-ptrace.h +include_HEADERS += include/libunwind-ppc64.h +endif -if REMOTE_ONLY - include_HEADERS = $(include_HEADERS_common) -else - include_HEADERS = $(include_HEADERS_common) include/libunwind.h \ - include/unwind.h +if !REMOTE_ONLY +include_HEADERS += include/libunwind.h include/unwind.h endif nodist_include_HEADERS = include/libunwind-common.h SUBDIRS = src tests doc -EXTRA_DIST = include/dwarf.h include/dwarf_i.h include/dwarf-eh.h \ +noinst_HEADERS = include/dwarf.h include/dwarf_i.h include/dwarf-eh.h \ include/libunwind_i.h include/mempool.h \ include/remote.h \ - include/libunwind-common.h.in \ include/tdep-arm/dwarf-config.h \ include/tdep-arm/jmpbuf.h include/tdep-arm/libunwind_i.h \ include/tdep-ia64/jmpbuf.h include/tdep-ia64/rse.h \ - include/libunwind-ia64.h include/tdep-ia64/libunwind_i.h \ - include/tdep-ia64/jmpbuf.h include/tdep-ia64/rse.h \ - include/tdep-ia64/script.h \ - include/libunwind-hppa.h include/tdep-hppa/libunwind_i.h \ + include/tdep-ia64/libunwind_i.h include/tdep-ia64/script.h \ + include/tdep-hppa/libunwind_i.h \ include/tdep-hppa/jmpbuf.h include/tdep-hppa/dwarf-config.h \ - include/libunwind-x86.h include/tdep-x86/libunwind_i.h \ + include/tdep-mips/libunwind_i.h \ + include/tdep-mips/jmpbuf.h include/tdep-mips/dwarf-config.h \ + include/tdep-x86/libunwind_i.h \ include/tdep-x86/jmpbuf.h include/tdep-x86/dwarf-config.h \ - include/libunwind-x86_64.h include/tdep-x86_64/libunwind_i.h \ + include/tdep-x86_64/libunwind_i.h \ include/tdep-x86_64/jmpbuf.h include/tdep-x86_64/dwarf-config.h \ - include/libunwind-ppc64.h include/tdep-ppc64/dwarf-config.h \ + include/tdep-ppc32/dwarf-config.h \ include/tdep-ppc32/jmpbuf.h include/tdep-ppc32/libunwind_i.h \ + include/tdep-ppc64/dwarf-config.h \ include/tdep-ppc64/jmpbuf.h include/tdep-ppc64/libunwind_i.h \ - include/libunwind.h include/tdep/libunwind_i.h \ + include/tdep/libunwind_i.h \ include/tdep/jmpbuf.h include/tdep/dwarf-config.h +EXTRA_DIST = include/libunwind-common.h.in + MAINTAINERCLEANFILES = \ Makefile.in \ INSTALL \ -- 1.7.2.2 _______________________________________________ Libunwind-devel mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/libunwind-devel
