.

3 files changed, 29 insertions, 18 deletions

diff --git a/lib/Makefile.in b/lib/Makefile.in
index d231b567b..3a8618ab9 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# Copyright (C) 1995-2005 Free Software Foundation, Inc.
+# Copyright (C) 1995-2006 Free Software Foundation, Inc.
 
 
 srcdir = @srcdir@
@@ -233,8 +233,8 @@ am__DEPENDENCIES_1 = @LIBOBJS@
 am__DEPENDENCIES_2 = @ALLOCA@
 libcoreutils_a_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_2)
-am_libcoreutils_a_OBJECTS = allocsa.$(OBJEXT) buffer-lcm.$(OBJEXT) \
-	full-read.$(OBJEXT) full-write.$(OBJEXT) \
+am_libcoreutils_a_OBJECTS = allocsa.$(OBJEXT) base64.$(OBJEXT) \
+	buffer-lcm.$(OBJEXT) full-read.$(OBJEXT) full-write.$(OBJEXT) \
 	localcharset.$(OBJEXT) mbswidth.$(OBJEXT) \
 	readtokens0.$(OBJEXT) strnlen1.$(OBJEXT) time_r.$(OBJEXT) \
 	unicodeio.$(OBJEXT) xalloc-die.$(OBJEXT) \
@@ -401,13 +401,13 @@ AM_CFLAGS = $(WARNING_CFLAGS) $(WERROR_CFLAGS)
 noinst_LIBRARIES = libcoreutils.a
 LDADD = $(noinst_LIBRARIES)
 AM_CPPFLAGS = -I.. -I$(srcdir)
-libcoreutils_a_SOURCES = allocsa.c allocsa.h buffer-lcm.c buffer-lcm.h \
-	euidaccess.h exit.h full-read.c full-read.h full-write.c \
-	full-write.h getaddrinfo.h gettext.h localcharset.c \
-	localcharset.h mbchar.h mbswidth.c mbswidth.h mbuiter.h \
-	readtokens0.c readtokens0.h strcase.h strnlen1.c strnlen1.h \
-	strstr.h time_r.c time_r.h unicodeio.c unicodeio.h verify.h \
-	xalloc-die.c xgethostname.c xgethostname.h xmemcoll.c \
+libcoreutils_a_SOURCES = allocsa.c allocsa.h base64.c base64.h \
+	buffer-lcm.c buffer-lcm.h euidaccess.h exit.h full-read.c \
+	full-read.h full-write.c full-write.h getaddrinfo.h gettext.h \
+	localcharset.c localcharset.h mbchar.h mbswidth.c mbswidth.h \
+	mbuiter.h readtokens0.c readtokens0.h strcase.h strnlen1.c \
+	strnlen1.h strstr.h time_r.c time_r.h unicodeio.c unicodeio.h \
+	verify.h xalloc-die.c xgethostname.c xgethostname.h xmemcoll.c \
 	xmemcoll.h xstrndup.c xstrndup.h xstrtoimax.c xstrtoumax.c \
 	printf-args.h printf-parse.h vasprintf.h vasnprintf.h
 libcoreutils_a_LIBADD = $(LIBOBJS) $(ALLOCA)
@@ -659,6 +659,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/xstrtoul.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/yesno.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/allocsa.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/base64.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buffer-lcm.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/full-read.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/full-write.Po@am__quote@
diff --git a/man/Makefile.in b/man/Makefile.in
index 42afec499..b58c1d2e0 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -310,7 +310,7 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 dist_man_MANS = \
-  basename.1 cat.1 chgrp.1 chmod.1 chown.1 chroot.1 cksum.1 comm.1 \
+  base64.1 basename.1 cat.1 chgrp.1 chmod.1 chown.1 chroot.1 cksum.1 comm.1 \
   cp.1 csplit.1 cut.1 date.1 dd.1 df.1 dir.1 dircolors.1 dirname.1 du.1 \
   echo.1 env.1 expand.1 expr.1 factor.1 false.1 fmt.1 fold.1 groups.1 \
   head.1 hostid.1 hostname.1 id.1 install.1 join.1 kill.1 \
@@ -550,6 +550,7 @@ uninstall-man: uninstall-man1
 	uninstall-man uninstall-man1
 
 
+base64.1:	$(common_dep)	$(srcdir)/base64.x	../src/base64.c
 basename.1:	$(common_dep)	$(srcdir)/basename.x	../src/basename.c
 cat.1:		$(common_dep)	$(srcdir)/cat.x		../src/cat.c
 chgrp.1:	$(common_dep)	$(srcdir)/chgrp.x	../src/chgrp.c
diff --git a/src/Makefile.in b/src/Makefile.in
index 984139def..4af8ce13a 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -60,8 +60,8 @@ bin_PROGRAMS = [$(EXEEXT) chgrp$(EXEEXT) chown$(EXEEXT) chmod$(EXEEXT) \
 	id$(EXEEXT) kill$(EXEEXT) logname$(EXEEXT) pathchk$(EXEEXT) \
 	printenv$(EXEEXT) printf$(EXEEXT) pwd$(EXEEXT) seq$(EXEEXT) \
 	sleep$(EXEEXT) tee$(EXEEXT) test$(EXEEXT) true$(EXEEXT) \
-	tty$(EXEEXT) whoami$(EXEEXT) yes$(EXEEXT) $(am__EXEEXT_1) \
-	$(am__EXEEXT_2)
+	tty$(EXEEXT) whoami$(EXEEXT) yes$(EXEEXT) base64$(EXEEXT) \
+	$(am__EXEEXT_1) $(am__EXEEXT_2)
 noinst_PROGRAMS = setuidgid$(EXEEXT)
 subdir = src
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
@@ -204,6 +204,11 @@ am__DEPENDENCIES_1 =
 am__DEPENDENCIES_2 = ../lib/libcoreutils.a $(am__DEPENDENCIES_1) \
 	../lib/libcoreutils.a
 __DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
+base64_SOURCES = base64.c
+base64_OBJECTS = base64.$(OBJEXT)
+base64_LDADD = $(LDADD)
+base64_DEPENDENCIES = ../lib/libcoreutils.a $(am__DEPENDENCIES_1) \
+	../lib/libcoreutils.a
 basename_SOURCES = basename.c
 basename_OBJECTS = basename.$(OBJEXT)
 basename_LDADD = $(LDADD)
@@ -650,8 +655,8 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(__SOURCES) basename.c cat.c $(chgrp_SOURCES) chmod.c \
-	$(chown_SOURCES) chroot.c cksum.c comm.c $(cp_SOURCES) \
+SOURCES = $(__SOURCES) base64.c basename.c cat.c $(chgrp_SOURCES) \
+	chmod.c $(chown_SOURCES) chroot.c cksum.c comm.c $(cp_SOURCES) \
 	csplit.c cut.c date.c dd.c df.c $(dir_SOURCES) dircolors.c \
 	dirname.c du.c echo.c env.c expand.c expr.c factor.c false.c \
 	fmt.c fold.c $(ginstall_SOURCES) head.c hostid.c hostname.c \
@@ -665,8 +670,8 @@ SOURCES = $(__SOURCES) basename.c cat.c $(chgrp_SOURCES) chmod.c \
 	stty.c su.c sum.c sync.c tac.c tail.c tee.c test.c touch.c \
 	tr.c true.c tsort.c tty.c uname.c unexpand.c uniq.c unlink.c \
 	uptime.c users.c $(vdir_SOURCES) wc.c who.c whoami.c yes.c
-DIST_SOURCES = $(__SOURCES) basename.c cat.c $(chgrp_SOURCES) chmod.c \
-	$(chown_SOURCES) chroot.c cksum.c comm.c $(cp_SOURCES) \
+DIST_SOURCES = $(__SOURCES) base64.c basename.c cat.c $(chgrp_SOURCES) \
+	chmod.c $(chown_SOURCES) chroot.c cksum.c comm.c $(cp_SOURCES) \
 	csplit.c cut.c date.c dd.c df.c $(dir_SOURCES) dircolors.c \
 	dirname.c du.c echo.c env.c expand.c expr.c factor.c false.c \
 	fmt.c fold.c $(ginstall_SOURCES) head.c hostid.c hostname.c \
@@ -1014,7 +1019,7 @@ uninstall-binPROGRAMS:
 	done
 
 clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) > /dev/null 2>&1 || /bin/rm -f $(bin_PROGRAMS)
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 
 installcheck-binPROGRAMS: $(bin_PROGRAMS)
 	bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \
@@ -1037,6 +1042,9 @@ clean-noinstPROGRAMS:
 [$(EXEEXT): $(__OBJECTS) $(__DEPENDENCIES) 
 	@rm -f [$(EXEEXT)
 	$(LINK) $(__LDFLAGS) $(__OBJECTS) $(__LDADD) $(LIBS)
+base64$(EXEEXT): $(base64_OBJECTS) $(base64_DEPENDENCIES) 
+	@rm -f base64$(EXEEXT)
+	$(LINK) $(base64_LDFLAGS) $(base64_OBJECTS) $(base64_LDADD) $(LIBS)
 basename$(EXEEXT): $(basename_OBJECTS) $(basename_DEPENDENCIES) 
 	@rm -f basename$(EXEEXT)
 	$(LINK) $(basename_LDFLAGS) $(basename_OBJECTS) $(basename_LDADD) $(LIBS)
@@ -1357,6 +1365,7 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/base64.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basename.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chgrp.Po@am__quote@