Reorganize lib/Makefile.am.

4 files changed, 42 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index ede7f01..ad13e11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-16  Bruno Haible  <haible@clisp.cons.org>
+
+	* configure.in: Don't check for memmove (unneeded).
+
 2001-09-02  Bruno Haible  <haible@clisp.cons.org>
 
 	* configure.in: Add check for 'raise'. Call gt_SIGNALBLOCKING.
diff --git a/configure.in b/configure.in
index eba7dce..283bc31 100644
--- a/configure.in
+++ b/configure.in
@@ -68,7 +68,7 @@ AC_FUNC_ALLOCA
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([getcwd mblen memcpy posix_spawn raise select strchr strerror \
 uname])
-AC_REPLACE_FUNCS([memmove memset stpcpy stpncpy strcspn \
+AC_REPLACE_FUNCS([memset stpcpy stpncpy strcspn \
 strcasecmp strncasecmp strpbrk strstr strtoul vasprintf])
 AM_FUNC_GETLINE
 if test $am_cv_func_working_getline != yes; then
diff --git a/lib/ChangeLog b/lib/ChangeLog
index 8daf32c..478fb91 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,10 @@
+2001-09-16  Bruno Haible  <haible@clisp.cons.org>
+
+	* Makefile.am (libnlsut_a_SOURCES): Remove safe-read.c.
+	(libnlsut_a_HEADER, LIBADD_SOURCE, LIBADD_HEADER, UNUSED_SOURCE,
+	UNUSED_HEADER): New variables.
+	(noinst_HEADERS, EXTRA_DIST): Use them.
+
 2001-09-08  Bruno Haible  <haible@clisp.cons.org>
 
 	* pipe-bidi.c (nonintr_close): Add function prototypes.
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 7b8dec6..235a87e 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -21,26 +21,43 @@ AUTOMAKE_OPTIONS = 1.2 gnits
 
 noinst_LIBRARIES = libnlsut.a
 
-EXTRA_DIST = alloca.c classpath.c config.charset error.c getline.c memset.c \
-memmove.c mkdtemp.c ref-add.sin ref-del.sin setenv.c stpcpy.c stpncpy.c \
-strcasecmp.c strcspn.c strncasecmp.c strpbrk.c strstr.c strtol.c strtoul.c \
-vasprintf.c \
-stdbool.h.in \
-gen-lbrkprop.c 3level.h
+# Sources that are compiled on all platforms.
 
 libnlsut_a_SOURCES = basename.c c-ctype.c concatpath.c execute.c findprog.c \
 fstrcmp.c full-write.c gcd.c getopt.c getopt1.c hash.c javacomp.c javaexec.c \
 linebreak.c localcharset.c mbswidth.c obstack.c pipe-bidi.c pipe-in.c \
-pipe-out.c progname.c safe-read.c sh-quote.c tmpdir.c wait-process.c xerror.c \
-xgetcwd.c xmalloc.c xstrdup.c
+pipe-out.c progname.c sh-quote.c tmpdir.c wait-process.c xerror.c xgetcwd.c \
+xmalloc.c xstrdup.c
+
+libnlsut_a_HEADER = c-ctype.h execute.h findprog.h fstrcmp.h full-write.h \
+gcd.h getopt.h hash.h javacomp.h javaexec.h lbrkprop.h linebreak.h mbswidth.h \
+obstack.h pathmax.h pipe.h progname.h sh-quote.h system.h tmpdir.h \
+utf8-ucs4.h utf16-ucs4.h wait-process.h xerror.h
+
+# Sources that are compiled only on platforms that lack the functions.
+
+LIBADD_SOURCE = alloca.c error.c getline.c memset.c mkdtemp.c setenv.c \
+stpcpy.c stpncpy.c strcasecmp.c strcspn.c strncasecmp.c strpbrk.c strstr.c \
+strtol.c strtoul.c vasprintf.c
+
+LIBADD_HEADER = error.h getline.h mkdtemp.h setenv.h strpbrk.h
+
+# Unused sources.
+
+UNUSED_SOURCE = memmove.c safe-read.c
+
+UNUSED_HEADER = safe-read.h
 
 libnlsut_a_LIBADD = @ALLOCA@ @LIBOBJS@
 
-noinst_HEADERS = c-ctype.h error.h execute.h findprog.h fstrcmp.h \
-full-write.h gcd.h getline.h getopt.h hash.h javacomp.h javaexec.h lbrkprop.h \
-linebreak.h mbswidth.h mkdtemp.h obstack.h pathmax.h pipe.h progname.h \
-safe-read.h setenv.h sh-quote.h strpbrk.h system.h tmpdir.h utf8-ucs4.h \
-utf16-ucs4.h wait-process.h xerror.h
+# List of files to be distributed.
+
+noinst_HEADERS = $(libnlsut_a_HEADER) $(LIBADD_HEADER) $(UNUSED_HEADER)
+
+EXTRA_DIST = classpath.c config.charset ref-add.sin ref-del.sin \
+$(LIBADD_SOURCE) $(UNUSED_SOURCE) \
+stdbool.h.in \
+gen-lbrkprop.c 3level.h
 
 DEFS = -DLIBDIR=\"$(libdir)\" @DEFS@
 INCLUDES = -I. -I$(srcdir) -I.. -I../intl