arts Makefile.cvs broken

[Benjamin Reed]

Trying to run Makefile.common cvs on the 1.4.0 final tarball gives me this:

---(snip!)---
Mr-Bungle:/sw/build/arts-1.4.0-21/arts-1.4.0 root# make -f
admin/Makefile.common cvs
*** Creating acinclude.m4
make[1]: Nothing to be done for `acinclude.m4'.
*** Creating list of subdirectories
*** Creating Makefile.am
*** Creating configure.files
*** Creating configure.in
*** Creating aclocal.m4
*** Creating configure
*** Creating config.h template
*** Creating Makefile templates
flow/gsl/gslmakefile.inc:43: invalid unused variable name:
`gslffttest_LDFLAGS'
flow/gsl/gslmakefile.inc:39: invalid unused variable name: `gsltests_LDADD'
flow/gsl/gslmakefile.inc:36: invalid unused variable name: `gslwchunk_LDADD'
flow/gsl/gslmakefile.inc:38: invalid unused variable name:
`gsltests_SOURCES'
flow/gsl/gslmakefile.inc:42: invalid unused variable name:
`gslffttest_LDADD'
flow/gsl/gslmakefile.inc:40: invalid unused variable name:
`gsltests_LDFLAGS'
flow/gsl/gslmakefile.inc:35: invalid unused variable name:
`gslwchunk_SOURCES'
flow/gsl/gslmakefile.inc:41: invalid unused variable name:
`gslffttest_SOURCES'
flow/gsl/gslmakefile.inc:37: invalid unused variable name:
`gslwchunk_LDFLAGS'
make: *** [cvs] Error 1
---(snip!)---

It looks like this is the culprit:

---(snip!)---
Index: flow/gsl/Makefile.am
===================================================================
RCS file: /home/kde/arts/flow/gsl/Makefile.am,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- flow/gsl/Makefile.am        18 Jan 2005 10:57:00 -0000      1.36
+++ flow/gsl/Makefile.am        24 Jan 2005 09:03:30 -0000      1.37
@@ -15,10 +15,9 @@
 libgsl_la_LIBADD = $(top_builddir)/mcop/libmcop.la -lm $(LIBPOSIX4)
$(GSL_LIBS) $(LIB_POLL) $(GLIB_LIBADD)
 libgsl_la_LDFLAGS = -no-undefined $(all_libraries)

-noinst_PROGRAMS = $(GSL_NOINST_PROGS)
+#noinst_PROGRAMS = $(GSL_NOINST_PROGS)

 GSL_progs_ldadd = libgsl.la -lm $(LIBPTHREAD)
-GSL_progs_LDFLAGS = $(USE_THREADS)

 GSL_cc_dummy = dummy.cc
 $(srcdir)/dummy.cc: gslconfig.h
---(snip!)---

...if I uncomment the noinst_PROGRAMS bit, it works.