From a78a908baba52c6cbbf5a2143fdcc91c2695bcfb Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Sun, 6 Jul 2008 22:26:49 +0000 Subject: [PATCH] Generated files listed in SOURCES (rather than included by other files) should not be listed in BUILT_SOURCES but rather have nodist_ prepended. They still need to be separately listed as CLEANFILES as they're built at make time. Reported by: David Harvey svn path=/trunk/yasm/; revision=2111 --- libyasm/Makefile.inc | 3 +-- modules/arch/lc3b/Makefile.inc | 4 +--- modules/arch/x86/Makefile.inc | 6 ++---- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/libyasm/Makefile.inc b/libyasm/Makefile.inc index 9e82a0e3..482af05a 100644 --- a/libyasm/Makefile.inc +++ b/libyasm/Makefile.inc @@ -28,12 +28,11 @@ libyasm_a_SOURCES += libyasm/valparam.c libyasm_a_SOURCES += libyasm/value.c libyasm_a_SOURCES += libyasm/xmalloc.c libyasm_a_SOURCES += libyasm/xstrdup.c -libyasm_a_SOURCES += module.c +nodist_libyasm_a_SOURCES += module.c module.c: $(top_srcdir)/libyasm/module.in genmodule$(EXEEXT) Makefile $(top_builddir)/genmodule$(EXEEXT) $(top_srcdir)/libyasm/module.in Makefile -BUILT_SOURCES += module.c CLEANFILES += module.c noinst_PROGRAMS += genmodule diff --git a/modules/arch/lc3b/Makefile.inc b/modules/arch/lc3b/Makefile.inc index 6fbc60ce..13cc33b8 100644 --- a/modules/arch/lc3b/Makefile.inc +++ b/modules/arch/lc3b/Makefile.inc @@ -3,15 +3,13 @@ libyasm_a_SOURCES += modules/arch/lc3b/lc3barch.c libyasm_a_SOURCES += modules/arch/lc3b/lc3barch.h libyasm_a_SOURCES += modules/arch/lc3b/lc3bbc.c -libyasm_a_SOURCES += lc3bid.c +nodist_libyasm_a_SOURCES += lc3bid.c YASM_MODULES += arch_lc3b lc3bid.c: $(srcdir)/modules/arch/lc3b/lc3bid.re re2c$(EXEEXT) $(top_builddir)/re2c$(EXEEXT) -s -o $@ $(srcdir)/modules/arch/lc3b/lc3bid.re -BUILT_SOURCES += lc3bid.c - CLEANFILES += lc3bid.c EXTRA_DIST += modules/arch/lc3b/tests/Makefile.inc diff --git a/modules/arch/x86/Makefile.inc b/modules/arch/x86/Makefile.inc index 0f682381..ef5e581d 100644 --- a/modules/arch/x86/Makefile.inc +++ b/modules/arch/x86/Makefile.inc @@ -5,8 +5,8 @@ libyasm_a_SOURCES += modules/arch/x86/x86arch.h libyasm_a_SOURCES += modules/arch/x86/x86bc.c libyasm_a_SOURCES += modules/arch/x86/x86expr.c libyasm_a_SOURCES += modules/arch/x86/x86id.c -libyasm_a_SOURCES += x86cpu.c -libyasm_a_SOURCES += x86regtmod.c +nodist_libyasm_a_SOURCES += x86cpu.c +nodist_libyasm_a_SOURCES += x86regtmod.c YASM_MODULES += arch_x86 @@ -49,8 +49,6 @@ x86regtmod.c: $(srcdir)/modules/arch/x86/x86regtmod.gperf genperf$(EXEEXT) BUILT_SOURCES += x86insn_nasm.c BUILT_SOURCES += x86insn_gas.c -BUILT_SOURCES += x86cpu.c -BUILT_SOURCES += x86regtmod.c CLEANFILES += x86insn_nasm.c CLEANFILES += x86insn_gas.c CLEANFILES += x86cpu.c