Make use of += for variables.

diff --git a/ChangeLog b/ChangeLog
index 383671d5d7d83b2500a9e9c2883d8579bdaaeab0..2426b01a5c2f2c619cef5f74cc7bfc19727ecdcd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-12  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am: Make use of += for variables.
+
 2003-01-12  Bruno Haible  <bruno@clisp.org>
 
        Portability to FreeBSD.

diff --git a/Makefile.am b/Makefile.am
index 883a1f59f12372e6fd57322ea16a7848ce4254b3..155ce61e18f3c3918ee83a9b35a184e72b148de5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the toplevel directory of the GNU NLS Utilities
-## Copyright (C) 1995-1999, 2000-2002 Free Software Foundation, Inc.
+## Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -22,10 +22,6 @@ ACLOCAL_AMFLAGS = -I m4
 
 MAKEINFO = env LANG= LANGUAGE= @MAKEINFO@
 
-gettextsrcdir = $(datadir)/gettext
-gettextsrc_DATA = ABOUT-NLS
-gettextsrc_SCRIPTS = config.rpath mkinstalldirs
-
 SUBDIRS = \
   doc intl intl-java lib @SUBDIR_libasprintf@ libuniname \
   src po projects misc man m4 tests
@@ -33,14 +29,16 @@ DIST_SUBDIRS = \
   doc intl intl-java lib libasprintf libuniname \
   src po projects misc man m4 tests
 
-EXTRA_DIST = config.rpath BUGS DISCLAIM PACKAGING README.gemtext \
-             djgpp/COPYING.DJ djgpp/Makefile.maint djgpp/README.DJ \
-             djgpp/README.in djgpp/README djgpp/config.bat djgpp/config.in \
-             djgpp/config.sed djgpp/config.site djgpp/djpwd.h \
-             djgpp/edtests.bat djgpp/fnchange.in djgpp/fnchange.lst \
-             djgpp/getpwnam.c djgpp/msginit.sed djgpp/tscript.sed \
-             djgpp/unsetenv.c \
-             os2/README.OS2 os2/Makefile os2/backward.def os2/configure.awk
+EXTRA_DIST = BUGS DISCLAIM PACKAGING README.gemtext
+
+
+# Files installed for use by gettextize.
+
+gettextsrcdir = $(datadir)/gettext
+gettextsrc_DATA = ABOUT-NLS
+gettextsrc_SCRIPTS = config.rpath mkinstalldirs
+
+EXTRA_DIST += config.rpath
 
 ABOUT-NLS: $(srcdir)/doc/nls.texi $(srcdir)/doc/matrix.texi
        rm -f $(srcdir)/ABOUT-NLS \
@@ -48,6 +46,21 @@ ABOUT-NLS: $(srcdir)/doc/nls.texi $(srcdir)/doc/matrix.texi
            -I $(srcdir)/doc --no-validate nls.texi
 
 
+# DJGPP port.
+
+EXTRA_DIST += djgpp/COPYING.DJ djgpp/Makefile.maint djgpp/README.DJ \
+              djgpp/README.in djgpp/README djgpp/config.bat djgpp/config.in \
+              djgpp/config.sed djgpp/config.site djgpp/djpwd.h \
+              djgpp/edtests.bat djgpp/fnchange.in djgpp/fnchange.lst \
+              djgpp/getpwnam.c djgpp/msginit.sed djgpp/tscript.sed \
+              djgpp/unsetenv.c
+
+
+# OS/2 port.
+
+EXTRA_DIST += os2/README.OS2 os2/Makefile os2/backward.def os2/configure.awk
+
+
 # Documentation tags not known to automake.
 
 ps:

diff --git a/doc/ChangeLog b/doc/ChangeLog
index e9ed04df48266da0c9efab40a8919a2825f0b906..31bafd4f86c854c87656aaedbe9ade924cbb07fc 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-12  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am: Make use of += for variables.
+
 2003-01-10  Bruno Haible  <bruno@clisp.org>
 
        * ISO_3166_de: New file.

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 0dfca94dde861f005a9bd5bc836e895faaebcdf2..ae0e63ba590420d8223936ec08323169d9b22af9 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the doc subdirectory of the GNU NLS Utilities
-## Copyright (C) 1995-1997, 2001-2002 Free Software Foundation, Inc.
+## Copyright (C) 1995-1997, 2001-2003 Free Software Foundation, Inc.
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@ pdfdir = $(docdir)
 htmldir = $(docdir)
 
 AUTOMAKE_OPTIONS = 1.2 gnits
+MOSTLYCLEANFILES =
 
 SED = sed
 RM = rm -f
@@ -87,7 +88,7 @@ uninstall-dvi:
        $(RM) $(DESTDIR)$(dvidir)/gettext.dvi
 
 # Temporary index files. automake doesn't remove them reliably by itself.
-MOSTLYCLEANFILES = \
+MOSTLYCLEANFILES += \
   gettext.am gettext.ams \
   gettext.cp gettext.cps \
   gettext.ef gettext.efs \

diff --git a/intl-java/ChangeLog b/intl-java/ChangeLog
index 3879306f5b9931e983a034bfd53abaff172a23c5..5f1795ebc4d042875eaf4c6a4487c64e603d9a12 100644 (file)
--- a/intl-java/ChangeLog
+++ b/intl-java/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-12  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am: Make use of += for variables.
+
 2002-08-06  Bruno Haible  <bruno@clisp.org>
 
        * gettext-0.11.5 released.

diff --git a/intl-java/Makefile.am b/intl-java/Makefile.am
index d3faeb174ada250aaf5b1aea1891aa6a6a4ebfce..b70052ae4911a3ebc995084148773fea04ad0b76 100644 (file)
--- a/intl-java/Makefile.am
+++ b/intl-java/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for intl-java directory in GNU NLS utilities package.
-## Copyright (C) 2001-2002 Free Software Foundation, Inc.
+## Copyright (C) 2001-2003 Free Software Foundation, Inc.
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -18,6 +18,8 @@
 ## Process this file with automake to produce Makefile.in.
 
 AUTOMAKE_OPTIONS = 1.2 gnits
+EXTRA_DIST =
+CLEANFILES =
 
 RM = rm -f
 
@@ -30,8 +32,6 @@ JAVACOMP = $(SHELL) ../lib/javacomp.sh
 JAVADOC1 = test ! -d /usr/lib/jdk1.1.8 || env PATH=/usr/lib/jdk1.1.8/bin:$$PATH javadoc
 JAVADOC2 = test ! -d /usr/lib/jdk1.3.1 || env PATH=/usr/lib/jdk1.3.1/bin:$$PATH javadoc
 
-EXTRA_DIST = gnu/gettext/GettextResource.java $(JAVADOC1_FILES) $(JAVADOC2_FILES)
-
 
 all-local: all-classes all-javadoc1 all-javadoc2
 install-data-local: install-classes install-javadoc1 install-javadoc2
@@ -51,7 +51,9 @@ gnu/gettext/GettextResource.class: $(srcdir)/gnu/gettext/GettextResource.java
 libintl.jar: gnu/gettext/GettextResource.class
        $(JAR) cf $@ gnu/gettext/GettextResource*.class
 
-CLEANFILES = libintl.jar gnu/gettext/*.class
+EXTRA_DIST += gnu/gettext/GettextResource.java
+
+CLEANFILES += libintl.jar gnu/gettext/*.class
 
 install-classes: install-classes-@BUILDJAVA@
 install-classes-no:
@@ -95,6 +97,8 @@ JAVADOC1_FILES = \
   javadoc1/images/variables.gif \
   javadoc1/images/yellow-ball-small.gif javadoc1/images/yellow-ball.gif
 
+EXTRA_DIST += $(JAVADOC1_FILES)
+
 install-javadoc1: all-javadoc1
        $(mkinstalldirs) $(DESTDIR)$(htmldir)/javadoc1
        $(mkinstalldirs) $(DESTDIR)$(htmldir)/javadoc1/images
@@ -137,6 +141,8 @@ JAVADOC2_FILES = \
   javadoc2/gnu/gettext/package-frame.html \
   javadoc2/gnu/gettext/GettextResource.html
 
+EXTRA_DIST += $(JAVADOC1_FILES)
+
 install-javadoc2: all-javadoc2
        $(mkinstalldirs) $(DESTDIR)$(htmldir)/javadoc2
        $(mkinstalldirs) $(DESTDIR)$(htmldir)/javadoc2/gnu/gettext

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 5480d193a427cbff2c0675fd0d61ed430d887c9d..d9c6ecb112d02f11f4a77ef0daba038723aa6a3b 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-12  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am: Make use of += for variables.
+       (install-exec-local): Avoid creating $(libdir) if it would be empty.
+
 2003-01-12  Bruno Haible  <bruno@clisp.org>
 
        * linebreak.c (iconv_string_keeping_offsets): Add an assertion, to

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 59e9f1a4225db1afad1208b9c14ba98be55b81aa..09718d5b0b7905c7b144dc0ed9cf84af40d21661 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the support lib subdirectory of the GNU NLS Utilities
-## Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc.
+## Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -18,6 +18,11 @@
 ## Process this file with automake to produce Makefile.in.
 
 AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
+EXTRA_DIST =
+MOSTLYCLEANFILES =
+CLEANFILES =
+DISTCLEANFILES =
+SUFFIXES =
 
 RM = rm -f
 
@@ -44,7 +49,6 @@ libgettextlib_la_SOURCES = \
   javacomp.h javacomp.c \
   javaexec.h javaexec.c \
   linebreak.h linebreak.c lbrkprop.h utf8-ucs4.h utf16-ucs4.h \
-  localcharset.c \
   mbswidth.h mbswidth.c \
   minmax.h \
   obstack.h obstack.c \
@@ -111,23 +115,33 @@ gettextsrc_DATA = gettext.h
 
 noinst_HEADERS = gettext.h
 
-EXTRA_DIST = classpath.c config.charset ref-add.sin ref-del.sin \
+EXTRA_DIST += classpath.c \
 $(LIBADD_SOURCE) $(UNUSED_SOURCE) \
-stdbool.h.in \
 gen-lbrkprop.c 3level.h Combining.txt
 
-DEFS = -DLIBDIR=\"$(libdir)\" -DEXEEXT=\"$(EXEEXT)\" @DEFS@
+DEFS = -DEXEEXT=\"$(EXEEXT)\" @DEFS@
 INCLUDES = -I. -I$(srcdir) -I.. -I../intl -I$(top_srcdir)/intl
 
 
-DISTCLEANFILES = fnmatch.h
+DISTCLEANFILES += fnmatch.h
 
 
-all-local c-ctype.lo execute.lo javacomp.lo javaexec.lo pipe-bidi.lo pipe-in.lo pipe-out.lo progname.lo tmpdir.lo wait-process.lo xerror.lo: @STDBOOL_H@
+# >>> gnulib module stdbool.
+EXTRA_DIST += stdbool.h.in
+
+# The following is needed in order to create an <stdbool.h> when the system
+# doesn't have one that works.
+all-local $(libgettextlib_la_OBJECTS): @STDBOOL_H@
 stdbool.h: stdbool.h.in
        sed -e 's/@''HAVE__BOOL''@/@HAVE__BOOL@/g' < $(srcdir)/stdbool.h.in > stdbool.h
-MOSTLYCLEANFILES = stdbool.h
+MOSTLYCLEANFILES += stdbool.h
+# <<< gnulib module stdbool.
+
 
+# >>> gnulib module localcharset.
+libgettextlib_la_SOURCES += localcharset.c
+EXTRA_DIST += config.charset ref-add.sin ref-del.sin
+DEFS += -DLIBDIR=\"$(libdir)\"
 
 # The following is needed in order to install a simple file in $(libdir)
 # which is shared with other installed packages. We use a list of referencing
@@ -141,7 +155,7 @@ all-local: charset.alias ref-add.sed ref-del.sed
 charset_alias = $(DESTDIR)$(libdir)/charset.alias
 charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
 install-exec-local: all-local
-       $(mkinstalldirs) $(DESTDIR)$(libdir)
+       test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir)
        if test -f $(charset_alias); then \
          sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
          $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
@@ -170,9 +184,10 @@ charset.alias: config.charset
        $(SHELL) $(srcdir)/config.charset '@host@' > t-$@
        mv t-$@ $@
 
-SUFFIXES = .sed .sin
+SUFFIXES += .sed .sin
 .sin.sed:
        sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $< > t-$@
        mv t-$@ $@
 
-CLEANFILES = charset.alias ref-add.sed ref-del.sed
+CLEANFILES += charset.alias ref-add.sed ref-del.sed
+# <<< gnulib module localcharset.

diff --git a/libasprintf/ChangeLog b/libasprintf/ChangeLog
index ec64ee6ac9400e5e7ac913bf2ebf2722f630a775..a2b51c1ab74382f86a20140014212dcce0aa4c14 100644 (file)
--- a/libasprintf/ChangeLog
+++ b/libasprintf/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-12  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am: Make use of += for variables.
+
 2002-12-07  Bruno Haible  <bruno@clisp.org>
 
        Switch to autoconf-2.57 and automake-1.7.2.

diff --git a/libasprintf/Makefile.am b/libasprintf/Makefile.am
index e0debdf7a6287ff7baf7488170ab03d7d5b3019e..f024c61a58dc821c8b1be67a57a8eeb5c446db22 100644 (file)
--- a/libasprintf/Makefile.am
+++ b/libasprintf/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the libasprintf subdirectory of the GNU NLS Utilities
-## Copyright (C) 2002 Free Software Foundation, Inc.
+## Copyright (C) 2002-2003 Free Software Foundation, Inc.
 ##
 ## This program is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU Library General Public License as published
@@ -20,6 +20,8 @@
 
 AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
 ACLOCAL_AMFLAGS = -I ../m4
+EXTRA_DIST =
+MOSTLYCLEANFILES =
 
 
 # Library include file.
@@ -43,6 +45,7 @@ lib_asprintf_EXTRASOURCES = \
   vasprintf.h vasprintf.c asprintf.c \
   liballoca.h
 lib-asprintf.lo: $(lib_asprintf_EXTRASOURCES)
+EXTRA_DIST += $(lib_asprintf_EXTRASOURCES)
 
 
 # Documentation.
@@ -84,7 +87,7 @@ uninstall-dvi:
        $(RM) $(DESTDIR)$(dvidir)/autosprintf.dvi
 
 # Temporary index files. automake doesn't remove them reliably by itself.
-MOSTLYCLEANFILES = \
+MOSTLYCLEANFILES += \
   autosprintf.am autosprintf.ams \
   autosprintf.cp autosprintf.cps \
   autosprintf.ef autosprintf.efs \
@@ -160,8 +163,7 @@ installdirs-html:
 uninstall-html:
        $(RM) $(DESTDIR)$(htmldir)/autosprintf.html
 
-
-EXTRA_DIST = $(lib_asprintf_EXTRASOURCES) texi2html autosprintf.html
+EXTRA_DIST += texi2html autosprintf.html
 
 
 # One more automake bug.

diff --git a/libuniname/ChangeLog b/libuniname/ChangeLog
index 7c2805fcbfc86b47152c9ba54a1fcfaa4086e213..e4b22232212b4c22fe9e0b829a3391e27f7b93a5 100644 (file)
--- a/libuniname/ChangeLog
+++ b/libuniname/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-12  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am: Make use of += for variables.
+
 2002-12-19  Bruno Haible  <bruno@clisp.org>
 
        * gen-uninames: Update for Unicode 3.2.0.

diff --git a/libuniname/Makefile.am b/libuniname/Makefile.am
index 6358b9f7f1826ab6510d144c09fc6562265d363d..2907ca5622e6afdaf02bfb7d13720dac8583af2c 100644 (file)
--- a/libuniname/Makefile.am
+++ b/libuniname/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for libuniname directory in GNU gettext package.
-## Copyright (C) 2002 Free Software Foundation, Inc.
+## Copyright (C) 2002-2003 Free Software Foundation, Inc.
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -18,6 +18,8 @@
 ## Process this file with automake to produce Makefile.in.
 
 AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
+EXTRA_DIST =
+
 
 noinst_LIBRARIES = libuniname.a
 
@@ -25,10 +27,13 @@ libuniname_a_SOURCES = uniname.h uniname.c uninames.h
 
 INCLUDES = -I.. -I../lib -I$(top_srcdir)/lib
 
+EXTRA_DIST += gen-uninames
+
+
 TESTS = test-names.sh
 TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) $(SHELL)
 
 noinst_PROGRAMS = test-names
 test_names_LDADD = libuniname.a ../lib/libgettextlib.la
 
-EXTRA_DIST = $(TESTS) gen-uninames UnicodeDataNames.txt
+EXTRA_DIST += $(TESTS) UnicodeDataNames.txt

diff --git a/misc/ChangeLog b/misc/ChangeLog
index e7f4d2eb9ee1166eaaac5604535f37f93c1fffe1..559de7134824d9634bc11eecadc78b993abe0959 100644 (file)
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-12  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am: Make use of += for variables.
+
 2003-01-08  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.am (EXTRA_DIST): Add elisp-comp.

diff --git a/misc/Makefile.am b/misc/Makefile.am
index 4794be0da932ffd0b16406515bc9ce8fb7cbb882..ddacd3a587f88525cadfc2b75e0fe8920d1b1ab8 100644 (file)
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -18,15 +18,42 @@
 ## Process this file with automake to produce Makefile.in.
 
 AUTOMAKE_OPTIONS = 1.2 gnits
+EXTRA_DIST =
+DISTCLEANFILES =
 
-EXTRA_DIST = elisp-comp gettext.perl gettext-sh tcl_gettext.c README-Tcl add-to-archive cvsuser.c archive.tar.gz $(lisp_LISP)
-DISTCLEANFILES = gettextize autopoint
-lisp_LISP = po-mode.el po-compat.el
+
+# Scripts for maintainers.
 
 bin_SCRIPTS = gettextize autopoint
 
+DISTCLEANFILES += gettextize autopoint
+
+EXTRA_DIST += add-to-archive cvsuser.c archive.tar.gz
+
 gettextsrcdir = $(datadir)/gettext
 gettextsrc_DATA = archive.tar.gz
 
 archive.tar.gz:
        (cd autopoint-files && tar cf - --owner=root --group=root `find archive -type f | grep -v /CVS/`) | gzip -c -9 > $@
+
+
+# Emacs Lisp code.
+
+lisp_LISP = po-mode.el po-compat.el
+
+EXTRA_DIST += elisp-comp $(lisp_LISP)
+
+
+# Old sh interface.
+
+EXTRA_DIST += gettext-sh
+
+
+# Old Tcl interface.
+
+EXTRA_DIST += tcl_gettext.c README-Tcl
+
+
+# Old Perl interface.
+
+EXTRA_DIST += gettext.perl

diff --git a/src/ChangeLog b/src/ChangeLog
index 7d06e23499bff190bc87210ec3ccce873b4cfa11..2fb413dcecb223846b4ee5e27788b987fdfa2582 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-12  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am: Make use of += for variables.
+
 2003-01-12  Bruno Haible  <bruno@clisp.org>
 
        * write-po.c (wrap): Add an assertion, to protect against Solaris 2.9

diff --git a/src/Makefile.am b/src/Makefile.am
index 96f1a5cd019fd6bffe3eadddceba4885ef08f1b8..f5910deba96ffa8ba80bbed7acfd480c88143aa4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for program src directory in GNU NLS utilities package.
-## Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc.
+## Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -18,6 +18,9 @@
 ## Process this file with automake to produce Makefile.in.
 
 AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
+EXTRA_DIST =
+CLEANFILES =
+DISTCLEANFILES =
 
 RM = rm -f
 
@@ -38,8 +41,7 @@ plural-table.h format.h xgettext.h x-c.h x-po.h x-python.h x-lisp.h \
 x-elisp.h x-librep.h x-smalltalk.h x-java.h x-awk.h x-ycp.h x-tcl.h x-php.h \
 x-rst.h x-glade.h
 
-EXTRA_DIST = FILES project-id msgunfmt.tcl \
-gnu/gettext/DumpResource.java gnu/gettext/GetURL.java
+EXTRA_DIST += FILES project-id
 
 localedir = $(datadir)/locale
 jardir = $(datadir)/gettext
@@ -159,7 +161,7 @@ x-java.c: x-java.l
        $(LEX) -o$@-tmp -Px_java_yy $(srcdir)/x-java.l
        test "$(LEX)" = ":" || mv $@-tmp $@
 
-DISTCLEANFILES = po-gram-gen2.h user-email
+DISTCLEANFILES += po-gram-gen2.h
 
 
 # Special rules for installation of auxiliary programs.
@@ -180,6 +182,8 @@ uninstall-local:
        $(RM) $(DESTDIR)$(libdir)/$(PACKAGE)/user-email
        $(RM) $(DESTDIR)$(libdir)/$(PACKAGE)/project-id
 
+DISTCLEANFILES += user-email
+
 
 # Special rules for Java compilation.
 
@@ -208,8 +212,10 @@ gnu/gettext/GetURL.class: $(srcdir)/gnu/gettext/GetURL.java
 gettext.jar: gnu/gettext/DumpResource.class gnu/gettext/GetURL.class
        $(JAR) cf $@ gnu/gettext/DumpResource*.class gnu/gettext/GetURL*.class
 
-CLEANFILES = gnu.gettext.DumpResource$(EXEEXT) gnu.gettext.GetURL$(EXEEXT) \
-             gettext.jar gnu/gettext/*.class
+EXTRA_DIST += gnu/gettext/DumpResource.java gnu/gettext/GetURL.java
+
+CLEANFILES += gnu.gettext.DumpResource$(EXEEXT) gnu.gettext.GetURL$(EXEEXT) \
+              gettext.jar gnu/gettext/*.class
 
 install-exec-local: install-exec-java-@BUILDJAVAEXE@
 install-exec-java-yes: all-java-yes
@@ -245,6 +251,8 @@ uninstall-java-no-no:
 
 # Special rules for Tcl auxiliary program.
 
+EXTRA_DIST += msgunfmt.tcl
+
 install-data-local: install-tcl
 install-tcl:
        $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)