From cc6360e2411edfe1644f7a8c92f91628de989dd4 Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Tue, 20 Aug 2019 20:39:18 +0100 Subject: [PATCH] test/Makefile.am: Make the stanzas more consistent. Organization: Straylight/Edgeware From: Mark Wooding We now have * TESTS * check_PROGRAMS * EXTRA_DIST * nodist_mumble_SOURCES * BUILT_SOURCES * mumble.out * check-local * -include * CLEANFILES in that order. --- test/Makefile.am | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index 04c5f37..c817d43 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -29,17 +29,14 @@ include $(top_srcdir)/vars.am ### The silly Chimaera example. check_PROGRAMS += chimaera --include chimaera.c-dep chimaera.h-dep - -EXTRA_DIST += chimaera.sod +EXTRA_DIST += chimaera.sod chimaera.ref nodist_chimaera_SOURCES = chimaera.c chimaera.h BUILT_SOURCES += $(nodist_chimaera_SOURCES) - -EXTRA_DIST += chimaera.ref -CLEANFILES += chimaera.out check-local:: chimaera chimaera.ref ./chimaera >chimaera.out diff -u $(srcdir)/chimaera.ref chimaera.out +-include chimaera.c-dep chimaera.h-dep +CLEANFILES += chimaera.out ###-------------------------------------------------------------------------- ### Other tests. @@ -63,22 +60,22 @@ check-local:: bad.out CLEANFILES += bad.raw-out bad.raw-err bad.out check_PROGRAMS += kwtest - EXTRA_DIST += kwtest.ref -CLEANFILES += kwtest.out -check-local:: kwtest kwtest.ref +kwtest.out: kwtest$(EXEEXT) ./kwtest >kwtest.out +check-local:: kwtest.out kwtest.ref diff -u $(srcdir)/kwtest.ref kwtest.out +CLEANFILES += kwtest.out check_PROGRAMS += rat --include rat.c-dep rat.h-dep - EXTRA_DIST += rat.sod rat.ref nodist_rat_SOURCES = rat.c rat.h BUILT_SOURCES += $(nodist_rat_SOURCES) -check-local:: rat rat.ref +rat.out: rat$(EXEEXT) ./rat >rat.out +check-local:: rat.out rat.ref diff -u $(srcdir)/rat.ref rat.out +-include rat.c-dep rat.h-dep check_PROGRAMS += kwbench kwbench_SOURCES = kwbench.c kwbench-back.c kwbench.h -- [mdw]