.

1 files changed, 11 insertions, 32 deletions

diff --git a/m4/Makefile.in b/m4/Makefile.in
index 0b367ca22..9f7783553 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4g from Makefile.am.
+# Makefile.in generated automatically by automake 1.4i from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -111,7 +111,8 @@ _am_quote = @_am_quote@
 install_sh = @install_sh@
 l = @l@
 
-EXTRA_DIST = README jm-glibc-io.m4n Makefile.am.in \
+EXTRA_DIST = \
+  README jm-glibc-io.m4 jm-glibc-io.m4n Makefile.am.in \
 afs.m4 \
 assert.m4 \
 bison.m4 \
@@ -181,16 +182,6 @@ utime.m4 \
 utimes.m4 \
 xstrtoumax.m4
 
-
-unlocked_functions = \
-  clearerr_unlocked feof_unlocked ferror_unlocked \
-  fflush_unlocked fgets_unlocked fputc_unlocked fputs_unlocked \
-  fread_unlocked fwrite_unlocked getc_unlocked getchar_unlocked \
-  putc_unlocked putchar_unlocked
-
-
-comma_separated = $(shell echo $(unlocked_functions)|tr -s ' ' ,)
-base_functions = $(patsubst %_unlocked,%,$(unlocked_functions))
 EXEEXT =
 OBJEXT = o
 subdir = m4
@@ -237,7 +228,7 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile all-local
+all-am: Makefile
 
 installdirs:
 
@@ -300,11 +291,9 @@ mostlyclean-am: mostlyclean-generic
 
 uninstall-am: uninstall-info-am
 
-uninstall-info: uninstall-info-am
-
-.PHONY: all all-am all-local check check-am clean clean-generic \
-	distclean distclean-generic distdir dvi dvi-am info info-am \
-	install install-am install-data install-data-am install-exec \
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am info info-am install \
+	install-am install-data install-data-am install-exec \
 	install-exec-am install-info install-info-am install-man \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
@@ -314,27 +303,19 @@ uninstall-info: uninstall-info-am
 Makefile.am: Makefile.am.in
 	rm -f $@ $@t
 	sed -n '1,/^##m4-files-begin/p' $< > $@t
-	((echo EXTRA_DIST = README jm-glibc-io.m4n Makefile.am.in|tr '\012' @);\
+	(((echo EXTRA_DIST =; \
+	   echo "  README jm-glibc-io.m4 jm-glibc-io.m4n Makefile.am.in" \
+	  ) | tr '\012' @); \
 	  (echo *.m4|tr ' ' @) ) \
 	  |sed 's/@$$/%/;s/@/ \\@/g' |tr @% '\012\012' \
 	  >> $@t
 	sed -n '/^##m4-files-end/,$$p' $< >> $@t
-	echo >> $@t
-	echo all-local: jm-glibc-io.m4 >> $@t
 	chmod a-w $@t
 	mv $@t $@
-jm-glibc-io.m4: jm-glibc-io.m4n Makefile
-	echo 'dnl This file is automatically generated from $<' > $@t
-	echo '' >> $@t
-	sed							\
-	  -e 's/@space_separated@/$(unlocked_functions)/g'	\
-	  -e 's/@comma_separated@/$(comma_separated)/g'		\
-	  $< >> $@t
-	move-if-change $@t $@
 
 unlocked-io.h: unlocked-io.hin Makefile.am.in
 	tmp=t$$$$;							\
-	echo ''						> $$tmp;	\
+	echo						> $$tmp;	\
 	for f in $(base_functions); do					\
 	  u=`echo $$f|tr '[:lower:]' '[:upper:]'`;			\
 	  echo "#  if HAVE_$${u}_UNLOCKED"		>> $$tmp;	\
@@ -347,8 +328,6 @@ unlocked-io.h: unlocked-io.hin Makefile.am.in
 	  $< > $@t;							\
 	rm -f $$tmp;							\
 	mv $@t $@
-
-all-local: jm-glibc-io.m4
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: