X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2FMakefile.am;h=5356aa6b76d03a1d9b66779d7fe69c01c4a603de;hb=fa3c480253f951338a59b896f15433d8f20aab38;hp=18865b2f0a9b9683804f3199da379dda9c078f4f;hpb=da980d2687828bdf8b199d5ad67c141cef2cf57c;p=gnulib.git

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 18865b2f0..5356aa6b7 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -7,35 +7,100 @@ noinst_LIBRARIES = libfetish.a
 INCLUDES = -I.. -I$(srcdir) -I../intl
 DEFS = -DLIBDIR=\"$(libdir)\" @DEFS@
 
+## Put relatively complex files at the beginning of the list so
+## that parallel compiles finish a tiny bit sooner.  I don't see
+## a way to make regex.c appear earlier in the list, since it's
+## added by automake, but on systems with an up to date GNU libc,
+## regex.c isn't even compiled.
 libfetish_a_SOURCES = \
-  getdate.y posixtm.c addext.c argmatch.c backupfile.c basename.c \
-  canon-host.c closeout.c diacrit.c dirname.c exclude.c filemode.c \
-  full-write.c getopt.c getopt1.c getstr.c getugroups.c hard-locale.c hash.c \
-  human.c idcache.c isdir.c linebuffer.c localcharset.c long-options.c \
-  makepath.c md5.c memcasecmp.c memcoll.c modechange.c path-concat.c \
-  quotearg.c readtokens.c readutmp.c safe-read.c same.c save-cwd.c \
-  savedir.c stripslash.c unicodeio.c userspec.c version-etc.c xgetcwd.c \
-  xgethostname.c xmalloc.c xstrdup.c xstrtod.c xstrtol.c xstrtoul.c \
-  xstrtoumax.c yesno.c
+  getdate.h getdate.y \
+  posixtm.c posixtm.h \
+  strftime.c \
+  getopt.c getopt.h getopt1.c \
+  hash.c hash.h \
+  hash-pjw.c hash-pjw.h \
+  __fpending.h \
+  addext.c \
+  argmatch.c argmatch.h \
+  backupfile.c backupfile.h \
+  basename.c \
+  bumpalloc.h \
+  canon-host.c \
+  closeout.c closeout.h \
+  diacrit.c diacrit.h \
+  dirname.c dirname.h \
+  dirfd.h \
+  dup-safer.c \
+  exclude.c exclude.h \
+  filemode.c filemode.h \
+  fnmatch.h \
+  fopen-safer.c \
+  fsusage.h \
+  full-write.c full-write.h \
+  getline.h \
+  getpagesize.h \
+  getstr.c getstr.h \
+  getugroups.c \
+  group-member.h \
+  hard-locale.c hard-locale.h \
+  human.c human.h \
+  idcache.c \
+  isdir.c \
+  lchown.h \
+  linebuffer.c linebuffer.h \
+  localcharset.c \
+  long-options.c long-options.h \
+  makepath.c makepath.h \
+  mbswidth.c mbswidth.h \
+  md5.c md5.h \
+  memcasecmp.c memcasecmp.h \
+  memcoll.c memcoll.h \
+  modechange.c modechange.h \
+  mountlist.h \
+  nanosleep.h \
+  path-concat.c path-concat.h \
+  pathmax.h \
+  physmem.c physmem.h \
+  quote.c quote.h \
+  quotearg.c quotearg.h \
+  readtokens.c readtokens.h \
+  readutmp.h \
+  regex.h \
+  safe-read.c safe-read.h \
+  same.c same.h \
+  save-cwd.c save-cwd.h \
+  savedir.c savedir.h \
+  sha.c sha.h \
+  stdio-safer.h \
+  stripslash.c \
+  strverscmp.h \
+  unicodeio.c unicodeio.h \
+  unistd-safer.h \
+  userspec.c \
+  version-etc.c version-etc.h \
+  xalloc.h \
+  xgetcwd.c \
+  xgethostname.c \
+  xmalloc.c \
+  xmemcoll.c xmemcoll.h \
+  xreadlink.c xreadlink.h \
+  xstrdup.c \
+  xstrtod.c xstrtod.h \
+  xstrtol.c xstrtol.h \
+  xstrtoul.c \
+  xstrtoimax.c \
+  xstrtoumax.c \
+  yesno.c
 
 libfetish_a_LIBADD = @LIBOBJS@ @ALLOCA@
 libfetish_a_DEPENDENCIES = $(libfetish_a_LIBADD)
 
-noinst_HEADERS = \
-  argmatch.h backupfile.h bumpalloc.h closeout.h diacrit.h dirname.h error.h \
-  exclude.h filemode.h fnmatch.h fsusage.h getdate.h getline.h getopt.h \
-  getstr.h getpagesize.h group-member.h hard-locale.h hash.h human.h lchown.h \
-  linebuffer.h long-options.h md5.h memcasecmp.h memcoll.h \
-  makepath.h modechange.h mountlist.h nanosleep.h obstack.h \
-  path-concat.h pathmax.h posixtm.h quotearg.h readtokens.h \
-  readutmp.h regex.h safe-read.h same.h save-cwd.h savedir.h \
-  strverscmp.h unicodeio.h version-etc.h xalloc.h xstrtod.h xstrtol.h
-
-BUILT_SOURCES = getdate.c lstat.c stat.c
+
+BUILT_SOURCES = getdate.c lstat.c stat.c unlocked-io.h
 MAINTAINERCLEANFILES = $(BUILT_SOURCES)
-DISTCLEANFILES = lstat.c stat.c
+DISTCLEANFILES = lstat.c stat.c unlocked-io.h
 
-EXTRA_DIST = xstat.in config.charset ref-add.sin ref-del.sin
+EXTRA_DIST = xstat.in config.charset ref-add.sin ref-del.sin gen-uio
 lstat.c: xstat.in
 	sed \
 	  -e '/@IGNORE@/d' \
@@ -54,6 +119,7 @@ stat.c: xstat.in
 	  $(srcdir)/xstat.in > $@-t
 	mv $@-t $@
 
+Makefile: $(BUILT_SOURCES)
 
 # 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
@@ -62,7 +128,7 @@ stat.c: xstat.in
 # On systems with glibc-2.1 or newer, the file is redundant, therefore we
 # avoid installing it.
 
-all-local: charset.alias ref-add.sed ref-del.sed lstat.c stat.c
+all-local: charset.alias ref-add.sed ref-del.sed lstat.c stat.c unlocked-io.h
 
 charset_alias = $(DESTDIR)$(libdir)/charset.alias
 charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
@@ -102,3 +168,14 @@ SUFFIXES = .sed .sin
 	mv $@-t $@
 
 CLEANFILES = charset.alias ref-add.sed ref-del.sed
+
+###############################################
+
+# FIXME: CAUTION this list is a duplicate of one in ../Makefile.cfg.
+io_functions = \
+  clearerr feof ferror fflush fgets fputc fputs \
+  fread fwrite getc getchar putc putchar
+
+unlocked-io.h: $(srcdir)/gen-uio Makefile.am
+	srcdir=$(srcdir) $(SHELL) $(srcdir)/gen-uio $(io_functions) > $@t
+	mv $@t $@