diff options
| -rw-r--r-- | man/Makefile.in | 2 | ||||
| -rw-r--r-- | src/Makefile.in | 120 | ||||
| -rw-r--r-- | tests/du/Makefile.in | 1 |
3 files changed, 68 insertions, 55 deletions
diff --git a/man/Makefile.in b/man/Makefile.in index 06754f8e8..0a5d80f29 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -183,7 +183,7 @@ mapped_name = `echo $*|sed 's/install/ginstall/'` programs = \ echo 'spy:;@echo $$(all_programs)' \ | MAKEFLAGS= $(MAKE) -s -C $(srcdir)/../src -f Makefile -f - spy \ - | fmt -1 | sort -u + | fmt -1 | sort -u | grep -v '\[' subdir = man ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 diff --git a/src/Makefile.in b/src/Makefile.in index 3d7ba0edf..ac84e3681 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -161,7 +161,7 @@ EXTRA_PROGRAMS = chroot df hostid nice pinky stty su uname uptime users who EXTRA_SCRIPTS = nohup bin_SCRIPTS = groups $(OPTIONAL_BIN_ZCRIPTS) -bin_PROGRAMS = chgrp chown chmod cp dd dircolors du \ +bin_PROGRAMS = [ chgrp chown chmod cp dd dircolors du \ ginstall link ln dir vdir ls mkdir \ mkfifo mknod mv readlink rm rmdir shred stat sync touch unlink \ cat cksum comm csplit cut expand fmt fold head join md5sum \ @@ -241,6 +241,9 @@ INSTALL_SU = \ ginstall_SOURCES = install.c copy.c cp-hash.c +# This is for the '[' program. Automake transliterates '[' to '_'. +__SOURCES = lbracket.c + cp_SOURCES = cp.c copy.c cp-hash.c dir_SOURCES = ls.c ls-dir.c vdir_SOURCES = ls.c ls-vdir.c @@ -293,28 +296,33 @@ CONFIG_CLEAN_FILES = EXTRA_PROGRAMS = chroot$(EXEEXT) df$(EXEEXT) hostid$(EXEEXT) \ nice$(EXEEXT) pinky$(EXEEXT) stty$(EXEEXT) su$(EXEEXT) \ uname$(EXEEXT) uptime$(EXEEXT) users$(EXEEXT) who$(EXEEXT) -bin_PROGRAMS = chgrp$(EXEEXT) chown$(EXEEXT) chmod$(EXEEXT) cp$(EXEEXT) \ - dd$(EXEEXT) dircolors$(EXEEXT) du$(EXEEXT) ginstall$(EXEEXT) \ - link$(EXEEXT) ln$(EXEEXT) dir$(EXEEXT) vdir$(EXEEXT) \ - ls$(EXEEXT) mkdir$(EXEEXT) mkfifo$(EXEEXT) mknod$(EXEEXT) \ - mv$(EXEEXT) readlink$(EXEEXT) rm$(EXEEXT) rmdir$(EXEEXT) \ - shred$(EXEEXT) stat$(EXEEXT) sync$(EXEEXT) touch$(EXEEXT) \ - unlink$(EXEEXT) cat$(EXEEXT) cksum$(EXEEXT) comm$(EXEEXT) \ - csplit$(EXEEXT) cut$(EXEEXT) expand$(EXEEXT) fmt$(EXEEXT) \ - fold$(EXEEXT) head$(EXEEXT) join$(EXEEXT) md5sum$(EXEEXT) \ - nl$(EXEEXT) od$(EXEEXT) paste$(EXEEXT) pr$(EXEEXT) ptx$(EXEEXT) \ - sha1sum$(EXEEXT) sort$(EXEEXT) split$(EXEEXT) sum$(EXEEXT) \ - tac$(EXEEXT) tail$(EXEEXT) tr$(EXEEXT) tsort$(EXEEXT) \ - unexpand$(EXEEXT) uniq$(EXEEXT) wc$(EXEEXT) basename$(EXEEXT) \ - date$(EXEEXT) dirname$(EXEEXT) echo$(EXEEXT) env$(EXEEXT) \ - expr$(EXEEXT) factor$(EXEEXT) false$(EXEEXT) hostname$(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) @OPTIONAL_BIN_PROGS@ \ - @DF_PROG@ +bin_PROGRAMS = [$(EXEEXT) chgrp$(EXEEXT) chown$(EXEEXT) chmod$(EXEEXT) \ + cp$(EXEEXT) dd$(EXEEXT) dircolors$(EXEEXT) du$(EXEEXT) \ + ginstall$(EXEEXT) link$(EXEEXT) ln$(EXEEXT) dir$(EXEEXT) \ + vdir$(EXEEXT) ls$(EXEEXT) mkdir$(EXEEXT) mkfifo$(EXEEXT) \ + mknod$(EXEEXT) mv$(EXEEXT) readlink$(EXEEXT) rm$(EXEEXT) \ + rmdir$(EXEEXT) shred$(EXEEXT) stat$(EXEEXT) sync$(EXEEXT) \ + touch$(EXEEXT) unlink$(EXEEXT) cat$(EXEEXT) cksum$(EXEEXT) \ + comm$(EXEEXT) csplit$(EXEEXT) cut$(EXEEXT) expand$(EXEEXT) \ + fmt$(EXEEXT) fold$(EXEEXT) head$(EXEEXT) join$(EXEEXT) \ + md5sum$(EXEEXT) nl$(EXEEXT) od$(EXEEXT) paste$(EXEEXT) \ + pr$(EXEEXT) ptx$(EXEEXT) sha1sum$(EXEEXT) sort$(EXEEXT) \ + split$(EXEEXT) sum$(EXEEXT) tac$(EXEEXT) tail$(EXEEXT) \ + tr$(EXEEXT) tsort$(EXEEXT) unexpand$(EXEEXT) uniq$(EXEEXT) \ + wc$(EXEEXT) basename$(EXEEXT) date$(EXEEXT) dirname$(EXEEXT) \ + echo$(EXEEXT) env$(EXEEXT) expr$(EXEEXT) factor$(EXEEXT) \ + false$(EXEEXT) hostname$(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) @OPTIONAL_BIN_PROGS@ @DF_PROG@ PROGRAMS = $(bin_PROGRAMS) +am___OBJECTS = lbracket.$(OBJEXT) +__OBJECTS = $(am___OBJECTS) +__LDADD = $(LDADD) +__DEPENDENCIES = ../lib/libfetish.a ../lib/libfetish.a +__LDFLAGS = basename_SOURCES = basename.c basename_OBJECTS = basename.$(OBJEXT) basename_LDADD = $(LDADD) @@ -761,41 +769,41 @@ am__depfiles_maybe = depfiles @AMDEP_TRUE@ ./$(DEPDIR)/head.Po ./$(DEPDIR)/hostid.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/hostname.Po ./$(DEPDIR)/id.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/install.Po ./$(DEPDIR)/join.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/kill.Po ./$(DEPDIR)/link.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/ln.Po ./$(DEPDIR)/logname.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/ls-dir.Po ./$(DEPDIR)/ls-ls.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/ls-vdir.Po ./$(DEPDIR)/ls.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/md5.Po ./$(DEPDIR)/md5sum.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/mkdir.Po ./$(DEPDIR)/mkfifo.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/mknod.Po ./$(DEPDIR)/mv.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/nice.Po ./$(DEPDIR)/nl.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/od.Po ./$(DEPDIR)/paste.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/pathchk.Po ./$(DEPDIR)/pinky.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/pr.Po ./$(DEPDIR)/printenv.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/printf.Po ./$(DEPDIR)/ptx.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/pwd.Po ./$(DEPDIR)/readlink.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/remove.Po ./$(DEPDIR)/rm.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/rmdir.Po ./$(DEPDIR)/seq.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/sha1sum.Po ./$(DEPDIR)/shred.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/sleep.Po ./$(DEPDIR)/sort.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/split.Po ./$(DEPDIR)/stat.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/stty.Po ./$(DEPDIR)/su.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/sum.Po ./$(DEPDIR)/sync.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/tac.Po ./$(DEPDIR)/tail.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/tee.Po ./$(DEPDIR)/test.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/touch.Po ./$(DEPDIR)/tr.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/true.Po ./$(DEPDIR)/tsort.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/tty.Po ./$(DEPDIR)/uname.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/unexpand.Po ./$(DEPDIR)/uniq.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/unlink.Po ./$(DEPDIR)/uptime.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/users.Po ./$(DEPDIR)/wc.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/who.Po ./$(DEPDIR)/whoami.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/yes.Po +@AMDEP_TRUE@ ./$(DEPDIR)/kill.Po ./$(DEPDIR)/lbracket.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/link.Po ./$(DEPDIR)/ln.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/logname.Po ./$(DEPDIR)/ls-dir.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/ls-ls.Po ./$(DEPDIR)/ls-vdir.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/ls.Po ./$(DEPDIR)/md5.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/md5sum.Po ./$(DEPDIR)/mkdir.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/mkfifo.Po ./$(DEPDIR)/mknod.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/mv.Po ./$(DEPDIR)/nice.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/nl.Po ./$(DEPDIR)/od.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/paste.Po ./$(DEPDIR)/pathchk.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/pinky.Po ./$(DEPDIR)/pr.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/printenv.Po ./$(DEPDIR)/printf.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/ptx.Po ./$(DEPDIR)/pwd.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/readlink.Po ./$(DEPDIR)/remove.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/rm.Po ./$(DEPDIR)/rmdir.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/seq.Po ./$(DEPDIR)/sha1sum.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/shred.Po ./$(DEPDIR)/sleep.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/sort.Po ./$(DEPDIR)/split.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/stat.Po ./$(DEPDIR)/stty.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/su.Po ./$(DEPDIR)/sum.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/sync.Po ./$(DEPDIR)/tac.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/tail.Po ./$(DEPDIR)/tee.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/test.Po ./$(DEPDIR)/touch.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/tr.Po ./$(DEPDIR)/true.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/tsort.Po ./$(DEPDIR)/tty.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/uname.Po ./$(DEPDIR)/unexpand.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/uniq.Po ./$(DEPDIR)/unlink.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/uptime.Po ./$(DEPDIR)/users.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/wc.Po ./$(DEPDIR)/who.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/whoami.Po ./$(DEPDIR)/yes.Po COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = basename.c cat.c $(chgrp_SOURCES) chmod.c \ +DIST_SOURCES = $(__SOURCES) 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 \ @@ -811,7 +819,7 @@ DIST_SOURCES = basename.c cat.c $(chgrp_SOURCES) chmod.c \ HEADERS = $(noinst_HEADERS) DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in -SOURCES = 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 id.c join.c kill.c link.c ln.c logname.c $(ls_SOURCES) $(md5sum_SOURCES) mkdir.c mkfifo.c mknod.c $(mv_SOURCES) nice.c nl.c od.c paste.c pathchk.c pinky.c pr.c printenv.c printf.c ptx.c pwd.c readlink.c $(rm_SOURCES) rmdir.c seq.c $(sha1sum_SOURCES) shred.c sleep.c sort.c split.c stat.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 +SOURCES = $(__SOURCES) 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 id.c join.c kill.c link.c ln.c logname.c $(ls_SOURCES) $(md5sum_SOURCES) mkdir.c mkfifo.c mknod.c $(mv_SOURCES) nice.c nl.c od.c paste.c pathchk.c pinky.c pr.c printenv.c printf.c ptx.c pwd.c readlink.c $(rm_SOURCES) rmdir.c seq.c $(sha1sum_SOURCES) shred.c sleep.c sort.c split.c stat.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 all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -846,7 +854,7 @@ uninstall-binPROGRAMS: done clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) > /dev/null 2>&1 || /bin/rm -f $(bin_PROGRAMS) installcheck-binPROGRAMS: $(bin_PROGRAMS) bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \ @@ -862,6 +870,9 @@ installcheck-binPROGRAMS: $(bin_PROGRAMS) else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \ done; \ done; rm -f c$${pid}_.???; exit $$bad +[$(EXEEXT): $(__OBJECTS) $(__DEPENDENCIES) + @rm -f [$(EXEEXT) + $(LINK) $(__LDFLAGS) $(__OBJECTS) $(__LDADD) $(LIBS) basename$(EXEEXT): $(basename_OBJECTS) $(basename_DEPENDENCIES) @rm -f basename$(EXEEXT) $(LINK) $(basename_LDFLAGS) $(basename_OBJECTS) $(basename_LDADD) $(LIBS) @@ -1199,6 +1210,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/install.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/join.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kill.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lbracket.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/link.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ln.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logname.Po@am__quote@ diff --git a/tests/du/Makefile.in b/tests/du/Makefile.in index a9816d1da..329653e9d 100644 --- a/tests/du/Makefile.in +++ b/tests/du/Makefile.in @@ -154,6 +154,7 @@ target_alias = @target_alias@ AUTOMAKE_OPTIONS = 1.4 gnits TESTS = \ + slash \ fd-leak \ hard-link 8gb basic restore-wd \ exclude no-x no-deref trailing-slash deref two-args slink |