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 <dmharvey@math.harvard.edu>

svn path=/trunk/yasm/; revision=2111

diff --git a/libyasm/Makefile.inc b/libyasm/Makefile.inc
index 9e82a0e331898bae92b9f99a15eaf098eaaabdfa..482af05ad42c10011e0f440fff7c9f0dd398152a 100644 (file)
--- 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 6fbc60ce77dc39fe2d7acc5e2a37fb7954cc3154..13cc33b84f8a851fad97656ea039141bac3a4c48 100644 (file)
--- 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 0f682381ff2b3dcbc7f16af6c92f75fb5d70e687..ef5e581db3a49f2aae6cac5409e25c97a965d62c 100644 (file)
--- 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