Better use of automake.

diff --git a/ChangeLog b/ChangeLog
index a65acd20c5823bd56737fe2b118c06d72cede0ab..49889d23132bf8074ab78c2b2b578ba2e7c75083 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-06-15  Bruno Haible  <haible@clisp.cons.org>
+
+       * configure.in: Remove post-processing of tests/Makefile.
+
 2001-06-10  Bruno Haible  <haible@clisp.cons.org>
 
        * configure.in: Add test for cross compilation and for PERL.

diff --git a/configure.in b/configure.in
index 944cf959925e15c9080e0d47052475e9577ac6e7..7f9a1ac59decb705524340e107eaa1893a5e7aad 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.13)
-AC_REVISION($Revision: 1.32 $)
+AC_REVISION($Revision: 1.33 $)
 AC_INIT(src/msgfmt.c)
 AM_INIT_AUTOMAKE(gettext, 0.11)
 RELEASE_DATE=2001-05-23      dnl in "date +%Y-%m-%d" format
@@ -134,12 +134,4 @@ changequote([, ])dnl
   sed -e "s/list='\\\$(lisp_LISP)'; for/list='\$(lisp_LISP)'; test '\$(EMACS)' = no || for/" \
       < misc/Makefile > misc/Makefile.tmp
   mv misc/Makefile.tmp misc/Makefile
-  dnl Workaround another automake-1.4 bug which forgets to add $(EXEEXT)
-  dnl suffixes to elements of EXTRA_PROGRAMS. It does correctly add the suffix
-  dnl to the elements of bin_PROGRAMS.
-changequote(,)dnl
-  sed -e '/^EXTRA_PROGRAMS = /{' -e 's/\([a-z0-9_]\)\( \)/\1\$(EXEEXT)\2/g' -e 's/\([a-z0-9_]\)$/\1\$(EXEEXT)/g' -e '}' \
-      < tests/Makefile > tests/Makefile.tmp
-changequote([, ])dnl
-  mv tests/Makefile.tmp tests/Makefile
 ])

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 965621be7a59b5f7408175d2d944f93c9f662697..9e1280090577e2741f772ed5b5fd1c2cf2aacaec 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,9 @@
+2001-06-15  Bruno Haible  <haible@clisp.cons.org>
+
+       * Makefile.am (noinst_PROGRAMS): New variable.
+       (EXTRA_PROGRAMS, CLEANFILES): Remove variables.
+       (all-local): Remove target.
+
 2001-06-10  Bruno Haible  <haible@clisp.cons.org>
 
        * msgmerge-10: New file.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 147064674351796d7e884091221b3c32cd320d11..dd9e1fb7accf89f3f994240306545fd2e4d76769 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -58,11 +58,9 @@ DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 LDADD = $(LDADD_@USE_INCLUDED_LIBINTL@)
 LDADD_yes = ../intl/libintl.la
 LDADD_no = ../intl/libgnuintl.la @INTLLIBS@
-EXTRA_PROGRAMS = tstgettext tstngettext cake
+noinst_PROGRAMS = tstgettext tstngettext cake
 tstgettext_SOURCES = tstgettext.c setlocale.c
 tstgettext_LDADD = ../lib/libnlsut.a $(LDADD)
 tstngettext_SOURCES = tstngettext.c setlocale.c
 tstngettext_LDADD = ../lib/libnlsut.a $(LDADD)
 cake_SOURCES = plural-1-prg.c setlocale.c
-all-local: $(EXTRA_PROGRAMS)
-CLEANFILES = $(EXTRA_PROGRAMS)