diff options
| author | Roland McGrath <roland@hack.frob.com> | 2011-10-16 09:23:00 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2011-10-16 09:24:27 -0700 |
| commit | a9cefae36d30f0bbc3d213c92716529e6a071762 (patch) | |
| tree | 4a769bc304780413b76763e74e43f2c64b286e14 | |
| parent | e9bf1d30e7fd35cbe11c6586500cab11a1d91918 (diff) | |
Include *_dis.h headers in dist; generate them only for --enable-maintainer-mode.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | libcpu/ChangeLog | 9 | ||||
| -rw-r--r-- | libcpu/Makefile.am | 21 |
3 files changed, 22 insertions, 9 deletions
@@ -33,6 +33,7 @@ config/missing config/ylwrap configure elfutils.spec +libcpu/*_dis.h libdw/known-dwarf.h po/en@boldquot.po po/en@quot.po diff --git a/libcpu/ChangeLog b/libcpu/ChangeLog index c49f8b9c..52a073ab 100644 --- a/libcpu/ChangeLog +++ b/libcpu/ChangeLog @@ -1,3 +1,12 @@ +2011-10-16 Roland McGrath <roland@hack.frob.com> + + * Makefile.am (libcpu_i386_a_SOURCES): Add i386_dis.h. + (libcpu_x86_64_a_SOURCES): Add x86_64_dis.h. + (i386_disasm.o, x86_64_disasm.o): Depend on those in $(srcdir). + (%_dis.h): Renamed target pattern to ... + ($(srcdir)/%_dis.h): ... this. + (noinst_HEADERS, noinst_PROGRAMS): Put under [MAINTAINER_MODE]. + 2010-08-16 Roland McGrath <roland@redhat.com> * Makefile.am (%_defs): New pattern rule. diff --git a/libcpu/Makefile.am b/libcpu/Makefile.am index c62db6d0..7dd25610 100644 --- a/libcpu/Makefile.am +++ b/libcpu/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to create Makefile.in ## -## Copyright (C) 2002-2010 Red Hat, Inc. +## Copyright (C) 2002-2011 Red Hat, Inc. ## This file is part of Red Hat elfutils. ## ## Red Hat elfutils is free software; you can redistribute it and/or modify @@ -33,21 +33,26 @@ LEX_OUTPUT_ROOT = lex.$(<F:lex.l=) AM_YFLAGS = -p$(<F:parse.y=) noinst_LIBRARIES = libcpu_i386.a libcpu_x86_64.a -noinst_PROGRAMS = i386_gendis -libcpu_i386_a_SOURCES = i386_disasm.c -libcpu_x86_64_a_SOURCES = x86_64_disasm.c +libcpu_i386_a_SOURCES = i386_disasm.c i386_dis.h +libcpu_x86_64_a_SOURCES = x86_64_disasm.c x86_64_dis.h i386_gendis_SOURCES = i386_gendis.c i386_lex.l i386_parse.y -i386_disasm.o: i386.mnemonics i386_dis.h -x86_64_disasm.o: x86_64.mnemonics x86_64_dis.h i386_disasm.c +i386_disasm.o: i386.mnemonics $(srcdir)/i386_dis.h +x86_64_disasm.o: x86_64.mnemonics $(srcdir)/x86_64_dis.h %_defs: $(srcdir)/defs/i386 m4 -D$* -DDISASSEMBLER $< > $@ -%_dis.h: %_defs i386_gendis +if MAINTAINER_MODE +noinst_HEADERS = memory-access.h i386_parse.h i386_data.h + +noinst_PROGRAMS = i386_gendis + +$(srcdir)/%_dis.h: %_defs i386_gendis ./i386_gendis $< > $@ +endif %.mnemonics: %_defs sed '1,/^%%/d;/^#/d;/^[[:space:]]*$$/d;s/[^:]*:\([^[:space:]]*\).*/MNE(\1)/;s/{[^}]*}//g;/INVALID/d' \ @@ -65,8 +70,6 @@ i386_gendis_LDADD = $(libeu) -lm $(libmudflap) i386_parse.h: i386_parse.c ; -noinst_HEADERS = memory-access.h i386_parse.h i386_data.h - EXTRA_DIST = defs/i386 CLEANFILES += $(foreach P,i386 x86_64,$P_defs $P.mnemonics $P_dis.h) |