X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2FMakefile.am;h=da1f7e250efe97e5259bf3086a1a186a1f0d651c;hb=5c2760a37a90fe3a22c5fddfb2dbf713b63beb32;hp=37c34f69e9a79284656e25baa5c8e7267658d985;hpb=5748a040bad3f51892a7e29d8f97ec4d0be4da2a;p=gnulib.git

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 37c34f69e..da1f7e250 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -18,6 +18,7 @@ libfetish_a_SOURCES = \
   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 \
@@ -28,19 +29,19 @@ libfetish_a_SOURCES = \
   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.c full-write.h \
   getline.h \
   getpagesize.h \
   getstr.c getstr.h \
   getugroups.c \
   group-member.h \
-  gtod.h \
   hard-locale.c hard-locale.h \
   human.c human.h \
   idcache.c \
@@ -72,7 +73,6 @@ libfetish_a_SOURCES = \
   sha.c sha.h \
   stdio-safer.h \
   stripslash.c \
-  strtoxmax.c \
   strverscmp.h \
   unicodeio.c unicodeio.h \
   unistd-safer.h \
@@ -82,13 +82,13 @@ libfetish_a_SOURCES = \
   xgetcwd.c \
   xgethostname.c \
   xmalloc.c \
+  xreadlink.c xreadlink.h \
   xstrdup.c \
   xstrtod.c xstrtod.h \
   xstrtol.c xstrtol.h \
   xstrtoul.c \
   xstrtoimax.c \
   xstrtoumax.c \
-  xstrtoxmax.c \
   yesno.c
 
 libfetish_a_LIBADD = @LIBOBJS@ @ALLOCA@
@@ -99,7 +99,7 @@ BUILT_SOURCES = getdate.c lstat.c stat.c unlocked-io.h
 MAINTAINERCLEANFILES = $(BUILT_SOURCES)
 DISTCLEANFILES = lstat.c stat.c unlocked-io.h
 
-EXTRA_DIST = xstat.in config.charset ref-add.sin ref-del.sin unlocked-io.hin
+EXTRA_DIST = xstat.in config.charset ref-add.sin ref-del.sin gen-uio
 lstat.c: xstat.in
 	sed \
 	  -e '/@IGNORE@/d' \
@@ -118,6 +118,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
@@ -174,20 +175,6 @@ io_functions = \
   clearerr feof ferror fflush fgets fputc fputs \
   fread fwrite getc getchar putc putchar
 
-a_z=abcdefghijklmnopqrstuvwxyz
-A_Z=ABCDEFGHIJKLMNOPQRSTUVWXYZ
-
-unlocked-io.h: $(srcdir)/unlocked-io.hin Makefile.am
-	tmp=t$$$$;							\
-	for f in $(io_functions); do					\
-	  u=`echo $$f|tr $(a_z) $(A_Z)`;				\
-	  echo "#  if HAVE_$${u}_UNLOCKED"		;		\
-	  echo "#   undef $$f"				;		\
-	  echo "#   define $$f(S) $${f}_unlocked (S)"	;		\
-	  echo '#  endif'				;		\
-	done > $$tmp;							\
-	sed '/^@replace_this@$$/r '$$tmp $(srcdir)/unlocked-io.hin	\
-	  | sed '/^@replace_this@$$/d'					\
-	  > $@t;							\
-	rm -f $$tmp;							\
+unlocked-io.h: $(srcdir)/gen-uio Makefile.am
+	srcdir=$(srcdir) $(SHELL) $(srcdir)/gen-uio $(io_functions) > $@t
 	mv $@t $@