X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2FMakefile.am;h=bc9235254af9088575f43cd94b4ac3fc07066d82;hb=608a29f2a7f39ac49829315f173f06475d235a9f;hp=d17b9e0352f16de31a17aebe93269ca8a4bb8bc2;hpb=c518eb1ef98075f69facca343040e12ddc495673;p=gnulib.git

diff --git a/lib/Makefile.am b/lib/Makefile.am
index d17b9e035..bc9235254 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = ../src/ansi2knr
 
 noinst_LIBRARIES = libfetish.a
 
-INCLUDES = -I.. -I$(srcdir) -I../intl
+INCLUDES = -I.. -I$(srcdir)
 DEFS = -DLIBDIR=\"$(libdir)\" @DEFS@
 
 ## Put relatively complex files at the beginning of the list so
@@ -13,11 +13,14 @@ DEFS = -DLIBDIR=\"$(libdir)\" @DEFS@
 ## added by automake, but on systems with an up to date GNU libc,
 ## regex.c isn't even compiled.
 libfetish_a_SOURCES = \
+  acl.h acl.c \
   getdate.h getdate.y \
   posixtm.c posixtm.h \
+  posixver.c posixver.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 \
@@ -28,6 +31,7 @@ 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 \
@@ -38,9 +42,10 @@ libfetish_a_SOURCES = \
   getline.h \
   getpagesize.h \
   getstr.c getstr.h \
+  gettime.c \
+  gettext.h \
   getugroups.c \
   group-member.h \
-  gtod.h \
   hard-locale.c hard-locale.h \
   human.c human.h \
   idcache.c \
@@ -56,7 +61,6 @@ libfetish_a_SOURCES = \
   memcoll.c memcoll.h \
   modechange.c modechange.h \
   mountlist.h \
-  nanosleep.h \
   path-concat.c path-concat.h \
   pathmax.h \
   physmem.c physmem.h \
@@ -69,10 +73,12 @@ libfetish_a_SOURCES = \
   same.c same.h \
   save-cwd.c save-cwd.h \
   savedir.c savedir.h \
+  settime.c \
   sha.c sha.h \
   stdio-safer.h \
   stripslash.c \
   strverscmp.h \
+  timespec.h \
   unicodeio.c unicodeio.h \
   unistd-safer.h \
   userspec.c \
@@ -81,6 +87,7 @@ libfetish_a_SOURCES = \
   xgetcwd.c \
   xgethostname.c \
   xmalloc.c \
+  xmemcoll.c xmemcoll.h \
   xreadlink.c xreadlink.h \
   xstrdup.c \
   xstrtod.c xstrtod.h \
@@ -98,7 +105,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' \
@@ -117,7 +124,6 @@ stat.c: xstat.in
 	  $(srcdir)/xstat.in > $@-t
 	mv $@-t $@
 
-
 # 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
 # packages so that "make uninstall" will remove the file if and only if it
@@ -168,25 +174,18 @@ CLEANFILES = charset.alias ref-add.sed ref-del.sed
 
 ###############################################
 
+# FIXME: remove this dependency once automake handles it.
+# As of cvs automake of about 2002-01-13,
+# this dependency is necessary to avoid a build failure
+# when running `make check' before running `make all'.
+# Otherwise, unlocked-io.h is not built before it's needed.
+getdate$U.o: unlocked-io.h
+
 # 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
 
-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 $@