[dist] Distribute files necessary to rebuild after distclean

The 'distclean' target deletes all of the .c files that were generated
during the dist step.  Since the .m files are not shipped in the
tarball, it becomes impossible to rebuild after that.

Fix this by shipping the .m files in the tarball along with the .mc
helper libraries that mc needs to rebuild the .c files.

Signed-off-by: Aaron Plattner <aplattner@nvidia.com>

20 files changed, 26 insertions, 1 deletions

diff --git a/xts5/Makefile.am b/xts5/Makefile.am
index 5f691c6c..b294ac6b 100644
--- a/xts5/Makefile.am
+++ b/xts5/Makefile.am
@@ -8,7 +8,7 @@ noinst_HEADERS = include
 CLEANFILES = */*/tet_lock bin/xts-config bin/xts-run tetexec.cfg
 LOGFILES = */*/*.log
 DISTCLEANFILES = $(LOGFILES) */*/*.log.tmp
-EXTRA_DIST = bin/xts-config.in bin/xts-run.in
+EXTRA_DIST = bin/xts-config.in bin/xts-run.in lib
 
 bin_SCRIPTS = bin/xts-config bin/xts-run
 dist_xts5_DATA = tetexec.cfg.in tet_scen tet_code
diff --git a/xts5/XI/Makefile.am b/xts5/XI/Makefile.am
index 23be6f2b..c93c4b02 100644
--- a/xts5/XI/Makefile.am
+++ b/xts5/XI/Makefile.am
@@ -14,6 +14,7 @@ LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \
 testprogdir = $(libexecdir)/$(subdir)
 nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:=.c)
+EXTRA_DIST = $(addsuffix .m,$(filter-out %_m,$(tprogs)))
 DISTCLEANFILES = $(BUILT_SOURCES)
 
 tprogs = \
diff --git a/xts5/XIproto/Makefile.am b/xts5/XIproto/Makefile.am
index 4c27deba..fc0ef9ce 100644
--- a/xts5/XIproto/Makefile.am
+++ b/xts5/XIproto/Makefile.am
@@ -15,6 +15,7 @@ LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \
 testprogdir = $(libexecdir)/$(subdir)
 nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:=.c)
+EXTRA_DIST = $(addsuffix .m,$(filter-out %_m,$(tprogs)))
 DISTCLEANFILES = $(BUILT_SOURCES)
 
 tprogs = \
diff --git a/xts5/Xlib10/Makefile.am b/xts5/Xlib10/Makefile.am
index 093bd556..4987c929 100644
--- a/xts5/Xlib10/Makefile.am
+++ b/xts5/Xlib10/Makefile.am
@@ -14,6 +14,7 @@ LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \
 testprogdir = $(libexecdir)/$(subdir)
 nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:=.c)
+EXTRA_DIST = $(addsuffix .m,$(filter-out %_m,$(tprogs)))
 DISTCLEANFILES = $(BUILT_SOURCES)
 
 tprogs = \
diff --git a/xts5/Xlib11/Makefile.am b/xts5/Xlib11/Makefile.am
index 8340f20e..8ffb0d3c 100644
--- a/xts5/Xlib11/Makefile.am
+++ b/xts5/Xlib11/Makefile.am
@@ -14,6 +14,7 @@ LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \
 testprogdir = $(libexecdir)/$(subdir)
 nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:=.c)
+EXTRA_DIST = $(addsuffix .m,$(filter-out %_m,$(tprogs)))
 DISTCLEANFILES = $(BUILT_SOURCES)
 
 tprogs = \
diff --git a/xts5/Xlib12/Makefile.am b/xts5/Xlib12/Makefile.am
index 1e5caeb5..3122a468 100644
--- a/xts5/Xlib12/Makefile.am
+++ b/xts5/Xlib12/Makefile.am
@@ -14,6 +14,7 @@ LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \
 testprogdir = $(libexecdir)/$(subdir)
 nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:=.c)
+EXTRA_DIST = $(addsuffix .m,$(filter-out %_m,$(tprogs)))
 DISTCLEANFILES = $(BUILT_SOURCES)
 
 tprogs = \
diff --git a/xts5/Xlib13/Makefile.am b/xts5/Xlib13/Makefile.am
index 25280efd..5cd485f9 100644
--- a/xts5/Xlib13/Makefile.am
+++ b/xts5/Xlib13/Makefile.am
@@ -14,6 +14,7 @@ LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \
 testprogdir = $(libexecdir)/$(subdir)
 nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:=.c)
+EXTRA_DIST = $(addsuffix .m,$(filter-out %_m,$(tprogs)))
 DISTCLEANFILES = $(BUILT_SOURCES)
 
 tprogs = \
diff --git a/xts5/Xlib14/Makefile.am b/xts5/Xlib14/Makefile.am
index 54a38c43..0d7db4f8 100644
--- a/xts5/Xlib14/Makefile.am
+++ b/xts5/Xlib14/Makefile.am
@@ -15,6 +15,7 @@ LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \
 testprogdir = $(libexecdir)/$(subdir)
 nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:=.c)
+EXTRA_DIST = $(addsuffix .m,$(filter-out %_m,$(tprogs)))
 DISTCLEANFILES = $(BUILT_SOURCES)
 
 tprogs = \
diff --git a/xts5/Xlib15/Makefile.am b/xts5/Xlib15/Makefile.am
index c20ffe35..fc48d0eb 100644
--- a/xts5/Xlib15/Makefile.am
+++ b/xts5/Xlib15/Makefile.am
@@ -14,6 +14,7 @@ LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \
 testprogdir = $(libexecdir)/$(subdir)
 nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:=.c)
+EXTRA_DIST = $(addsuffix .m,$(filter-out %_m,$(tprogs)))
 DISTCLEANFILES = $(BUILT_SOURCES)
 
 XDefaultString_LDADD = $(top_builddir)/xts5/src/libXR5/libXR5.la $(LDADD)
diff --git a/xts5/Xlib16/Makefile.am b/xts5/Xlib16/Makefile.am
index c1f02b2b..f055a58c 100644
--- a/xts5/Xlib16/Makefile.am
+++ b/xts5/Xlib16/Makefile.am
@@ -14,6 +14,11 @@ LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \
 testprogdir = $(libexecdir)/$(subdir)
 nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:=.c)
+EXTRA_DIST = \
+	$(addsuffix .m,$(filter-out %_m,$(tprogs))) \
+	getres.mc \
+	putres.mc \
+	rescommon.mc
 DISTCLEANFILES = $(BUILT_SOURCES)
 
 XrmCombineDatabase_LDADD = $(top_builddir)/xts5/src/libXR5/libXR5.la $(LDADD)
diff --git a/xts5/Xlib17/Makefile.am b/xts5/Xlib17/Makefile.am
index e4160313..dfe91dda 100644
--- a/xts5/Xlib17/Makefile.am
+++ b/xts5/Xlib17/Makefile.am
@@ -14,6 +14,7 @@ LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \
 testprogdir = $(libexecdir)/$(subdir)
 nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:=.c)
+EXTRA_DIST = $(addsuffix .m,$(filter-out %_m,$(tprogs)))
 DISTCLEANFILES = $(BUILT_SOURCES)
 
 tprogs = \
diff --git a/xts5/Xlib3/Makefile.am b/xts5/Xlib3/Makefile.am
index ef1f8a1c..55e82a11 100644
--- a/xts5/Xlib3/Makefile.am
+++ b/xts5/Xlib3/Makefile.am
@@ -14,6 +14,7 @@ LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \
 testprogdir = $(libexecdir)/$(subdir)
 nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:=.c)
+EXTRA_DIST = $(addsuffix .m,$(filter-out %_m,$(tprogs)))
 DISTCLEANFILES = $(BUILT_SOURCES)
 
 # Tests ending in _m test the macro version of Xlib
diff --git a/xts5/Xlib4/Makefile.am b/xts5/Xlib4/Makefile.am
index c4704efc..3fa3682b 100644
--- a/xts5/Xlib4/Makefile.am
+++ b/xts5/Xlib4/Makefile.am
@@ -14,6 +14,9 @@ LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \
 testprogdir = $(libexecdir)/$(subdir)
 nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:=.c)
+EXTRA_DIST = \
+	$(addsuffix .m,$(filter-out %_m,$(tprogs))) \
+	XCreateWindow/commattr.mc
 DISTCLEANFILES = $(BUILT_SOURCES)
 
 tprogs = \
diff --git a/xts5/Xlib5/Makefile.am b/xts5/Xlib5/Makefile.am
index f51d6f01..8934442c 100644
--- a/xts5/Xlib5/Makefile.am
+++ b/xts5/Xlib5/Makefile.am
@@ -14,6 +14,7 @@ LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \
 testprogdir = $(libexecdir)/$(subdir)
 nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:=.c)
+EXTRA_DIST = $(addsuffix .m,$(filter-out %_m,$(tprogs)))
 DISTCLEANFILES = $(BUILT_SOURCES)
 
 tprogs = \
diff --git a/xts5/Xlib6/Makefile.am b/xts5/Xlib6/Makefile.am
index cb03974e..e4ba11a3 100644
--- a/xts5/Xlib6/Makefile.am
+++ b/xts5/Xlib6/Makefile.am
@@ -14,6 +14,7 @@ LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \
 testprogdir = $(libexecdir)/$(subdir)
 nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:=.c)
+EXTRA_DIST = $(addsuffix .m,$(filter-out %_m,$(tprogs)))
 DISTCLEANFILES = $(BUILT_SOURCES)
 
 tprogs = \
diff --git a/xts5/Xlib7/Makefile.am b/xts5/Xlib7/Makefile.am
index 521453ca..6f98f8f3 100644
--- a/xts5/Xlib7/Makefile.am
+++ b/xts5/Xlib7/Makefile.am
@@ -15,6 +15,7 @@ LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \
 testprogdir = $(libexecdir)/$(subdir)
 nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:=.c)
+EXTRA_DIST = $(addsuffix .m,$(filter-out %_m,$(tprogs)))
 DISTCLEANFILES = $(BUILT_SOURCES)
 
 tprogs = \
diff --git a/xts5/Xlib8/Makefile.am b/xts5/Xlib8/Makefile.am
index c0f39d7f..8925e110 100644
--- a/xts5/Xlib8/Makefile.am
+++ b/xts5/Xlib8/Makefile.am
@@ -14,6 +14,7 @@ LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \
 testprogdir = $(libexecdir)/$(subdir)
 nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:=.c)
+EXTRA_DIST = $(addsuffix .m,$(filter-out %_m,$(tprogs)))
 DISTCLEANFILES = $(BUILT_SOURCES)
 
 XFlushGC_LDADD = $(top_builddir)/xts5/src/libXR5/libXR5.la $(LDADD)
diff --git a/xts5/Xlib9/Makefile.am b/xts5/Xlib9/Makefile.am
index f7d7eefb..4803fea9 100644
--- a/xts5/Xlib9/Makefile.am
+++ b/xts5/Xlib9/Makefile.am
@@ -14,6 +14,7 @@ LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \
 testprogdir = $(libexecdir)/$(subdir)
 nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:=.c)
+EXTRA_DIST = $(addsuffix .m,$(filter-out %_m,$(tprogs)))
 DISTCLEANFILES = $(BUILT_SOURCES)
 
 tprogs = \
diff --git a/xts5/Xopen/Makefile.am b/xts5/Xopen/Makefile.am
index 50945180..3c827f98 100644
--- a/xts5/Xopen/Makefile.am
+++ b/xts5/Xopen/Makefile.am
@@ -14,6 +14,7 @@ LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \
 testprogdir = $(libexecdir)/$(subdir)
 nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:=.c)
+EXTRA_DIST = $(addsuffix .m,$(filter-out %_m,$(tprogs)))
 DISTCLEANFILES = $(BUILT_SOURCES)
 
 tprogs = \
diff --git a/xts5/Xproto/Makefile.am b/xts5/Xproto/Makefile.am
index f3c5a1ba..8249d0ef 100644
--- a/xts5/Xproto/Makefile.am
+++ b/xts5/Xproto/Makefile.am
@@ -15,6 +15,7 @@ LDADD = $(top_builddir)/src/tet3/tcm/libtcmmain.la \
 testprogdir = $(libexecdir)/$(subdir)
 nobase_testprog_PROGRAMS = $(tprogs)
 BUILT_SOURCES = $(tprogs:=.c)
+EXTRA_DIST = $(addsuffix .m,$(filter-out %_m,$(tprogs)))
 DISTCLEANFILES = $(BUILT_SOURCES)
 
 tprogs = \