works on fileutils except for all

diff --git a/automake.in b/automake.in
index c698cda..d341a73 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -87,6 +87,9 @@ do
         sed -n -f $am_rmnl ${am_makefile}.am |
         sed -n "/^[     ]*${am_file}_SOURCES[   ]*=/{
 s/SOURCES/OBJECTS/
+s/@[^@]*@//g
+s/\$([^)]*)//g
+s/\${[^}]*}//g
 s/\\.cc/.o/g
 s/\\.\${kr}c/.o/g
 s/\\.\$(kr)c/.o/g

diff --git a/clean.am b/clean.am
index 6eb3660..d335576 100644 (file)
--- a/clean.am
+++ b/clean.am
@@ -2,10 +2,11 @@ mostlyclean:
        rm -f *.o *.krc *.krh core
 
 clean: mostlyclean
-       rm -f $(PROGRAMS) $(LIBRARIES) $(TEXFILES) $(CLEANFILES)
+       rm -f $(PROGRAMS) $(LIBFILES) $(TEXFILES) $(CLEANFILES)
 
 distclean: clean
-       rm -f Makefile
+       rm -f Makefile *.tab.c $(DISTCLEANFILES)
 
 realclean: distclean
        rm -f TAGS
+

diff --git a/compile.am b/compile.am
index 26595ec..8da8ab5 100644 (file)
--- a/compile.am
+++ b/compile.am
@@ -1,17 +1,10 @@
-CC = @CC@
-LEX = @LEX@
-YACC = @YACC@
-ANSI2KNR = ./ansi2knr
-
-DEFS = @DEFS@
-CFLAGS = @CFLAGS@
-
 .SUFFIXES: .c .o .krc .krh
 .c.o:
-       $(CC) -c $(DEFS) $(CPPFLAGS) $(CFLAGS) $<
+       $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $<
 
 .c.krc:
        $(ANSI2KNR) $< > $@
 
 .h.krh:
        $(ANSI2KNR) $< > $@
+

diff --git a/dist-subd.am b/dist-subd.am
index 8062bed..d698c53 100644 (file)
--- a/dist-subd.am
+++ b/dist-subd.am
@@ -1,6 +1,7 @@
-dist: $(DISTFILES)
-       mkdir ../`cat ../distname`/src; chmod 777 ../`cat ../distname`/src
+dist: $(DIST_FILES)
+       mkdir ../`cat ../distname`/src
        @echo "Copying distribution files"
-       @for file in $(DISTFILES); do \
+       @for file in $(DIST_FILES); do \
          cp -p $(srcdir)/$$file ../`cat ../distname`/src; \
        done
+

diff --git a/dist.am b/dist.am
index aafdaef..6b476d5 100644 (file)
--- a/dist.am
+++ b/dist.am
@@ -1,7 +1,7 @@
-dist: $(DISTFILES)
+dist: $(DIST_FILES)
        rm -rf `cat distname`; mkdir `cat distname`
        @echo "Copying distribution files"
-       @for file in $(DISTFILES); do \
+       @for file in $(DIST_FILES); do \
          cp -p $(srcdir)/$$file `cat distname`; \
        done
        if test -n "$(SUBDIRS)"; then \
@@ -10,3 +10,4 @@ dist: $(DISTFILES)
        chmod -R a+r `cat distname`
        tar -chozf `cat distname`.tar.gz `cat distname`
        rm -rf `cat distname` distname
+

diff --git a/footer.am b/footer.am
index 349e3c1..65bf462 100644 (file)
--- a/footer.am
+++ b/footer.am
@@ -1,6 +1,11 @@
-check:
+check::
 
-tags: TAGS
+tags:: TAGS
+
+TAGS::
+       cd $(srcdir); etags $(SOURCES)
+
+# 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:
 
-TAGS:
-       cd $(srcdir); etags *.[chlyCm] *.cc

diff --git a/header-vars.am b/header-vars.am
index 4745c5c..dec5f44 100644 (file)
--- a/header-vars.am
+++ b/header-vars.am
@@ -18,6 +18,7 @@
 SHELL = /bin/sh
 
 srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 prefix = @prefix@
 exec_prefix = @exec_prefix@

diff --git a/header.am b/header.am
index 13b7a69..1cfbbaf 100644 (file)
--- a/header.am
+++ b/header.am
@@ -1,32 +1,2 @@
-# Makefile generated automatically by automake from Makefile.am.
-# Copyright (C) 1994 Free Software Foundation, Inc.
+all:: ${ALL}
 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-transform = @program_transform_name@
-
-ALL = ${PROGRAMS} ${LIBRARIES}
-
-all: ${ALL}

diff --git a/lib/am/clean.am b/lib/am/clean.am
index 6eb3660..d335576 100644 (file)
--- a/lib/am/clean.am
+++ b/lib/am/clean.am
@@ -2,10 +2,11 @@ mostlyclean:
        rm -f *.o *.krc *.krh core
 
 clean: mostlyclean
-       rm -f $(PROGRAMS) $(LIBRARIES) $(TEXFILES) $(CLEANFILES)
+       rm -f $(PROGRAMS) $(LIBFILES) $(TEXFILES) $(CLEANFILES)
 
 distclean: clean
-       rm -f Makefile
+       rm -f Makefile *.tab.c $(DISTCLEANFILES)
 
 realclean: distclean
        rm -f TAGS
+

diff --git a/lib/am/compile.am b/lib/am/compile.am
index 26595ec..8da8ab5 100644 (file)
--- a/lib/am/compile.am
+++ b/lib/am/compile.am
@@ -1,17 +1,10 @@
-CC = @CC@
-LEX = @LEX@
-YACC = @YACC@
-ANSI2KNR = ./ansi2knr
-
-DEFS = @DEFS@
-CFLAGS = @CFLAGS@
-
 .SUFFIXES: .c .o .krc .krh
 .c.o:
-       $(CC) -c $(DEFS) $(CPPFLAGS) $(CFLAGS) $<
+       $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $<
 
 .c.krc:
        $(ANSI2KNR) $< > $@
 
 .h.krh:
        $(ANSI2KNR) $< > $@
+

diff --git a/lib/am/footer.am b/lib/am/footer.am
index 349e3c1..65bf462 100644 (file)
--- a/lib/am/footer.am
+++ b/lib/am/footer.am
@@ -1,6 +1,11 @@
-check:
+check::
 
-tags: TAGS
+tags:: TAGS
+
+TAGS::
+       cd $(srcdir); etags $(SOURCES)
+
+# 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:
 
-TAGS:
-       cd $(srcdir); etags *.[chlyCm] *.cc

diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index 4745c5c..dec5f44 100644 (file)
--- a/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@ -18,6 +18,7 @@
 SHELL = /bin/sh
 
 srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 prefix = @prefix@
 exec_prefix = @exec_prefix@

diff --git a/lib/am/header.am b/lib/am/header.am
index 13b7a69..1cfbbaf 100644 (file)
--- a/lib/am/header.am
+++ b/lib/am/header.am
@@ -1,32 +1,2 @@
-# Makefile generated automatically by automake from Makefile.am.
-# Copyright (C) 1994 Free Software Foundation, Inc.
+all:: ${ALL}
 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-transform = @program_transform_name@
-
-ALL = ${PROGRAMS} ${LIBRARIES}
-
-all: ${ALL}

diff --git a/lib/am/library.am b/lib/am/library.am
index 1b467d6..ff57221 100644 (file)
--- a/lib/am/library.am
+++ b/lib/am/library.am
@@ -1,5 +1,5 @@
-lib@LIBRARY@.a: $(@LIBRARY@_OBJECTS)
+lib@LIBRARY@.a: $(@LIBRARY@_OBJECTS) @LIBOBJS@ @ALLOCA@
        rm -f lib@LIBRARY@.a
-       $(AR) cru lib@LIBRARY@.a $(@LIBRARY@_OBJECTS)
+       $(AR) cru lib@LIBRARY@.a $(@LIBRARY@_OBJECTS) @LIBOBJS@ @ALLOCA@
        $(RANLIB) lib@LIBRARY@.a
 

diff --git a/lib/am/mans-vars.am b/lib/am/mans-vars.am
index 7d10c7f..e61014f 100644 (file)
--- a/lib/am/mans-vars.am
+++ b/lib/am/mans-vars.am
@@ -1,5 +1,4 @@
 mandir = $(prefix)/man
-catdir = $(prefix)/cat
 
 NROFF = nroff
 

diff --git a/lib/am/mans.am b/lib/am/mans.am
index 598f1c8..11c0cfd 100644 (file)
--- a/lib/am/mans.am
+++ b/lib/am/mans.am
@@ -1,19 +1,15 @@
-mandir = $(prefix)/man
-catdir = $(prefix)/cat
-
-NROFF = nroff
-
 install:: install-man
 
 install-man:
        for man in $(MANS); do \
-         sect=`echo $$man|sed 's%.*\(\.[0-9][a-z]*\)$$%\1%'; \
-         inst=`basename $$man $sect|sed '$(transform)'`.$$sect; \
+         sect=`echo $$man|sed 's%.*\.\([0-9][a-z]*\)$$%\1%'`; \
+         inst=`basename $$man $$sect|sed '$(transform)'`$$sect; \
          mdir=$(mandir)/man$$sect; \
+         $(top_srcdir)/mkinstalldirs $(mdir); \
          echo installing $$man as $$mdir/$$inst; \
          $(INSTALL_DATA) $(srcdir)/$$man $$mdir/$$inst; \
-         if test -d $(catdir); then
-           cdir=$(mandir)/cat$$sect; \
+         cdir=$(mandir)/cat$$sect; \
+         if test -d $$cdir; then \
            echo formatting $$man as $$cdir/$$inst; \
            $(NROFF) -man $(srcdir)/$$man > $$cdir/$$inst; \
          fi; \
@@ -29,3 +25,4 @@ uninstall-man:
          cdir=$(mandir)/cat$$sect; \
          rm -f $$mdir/$$inst $$cdir/$$inst; \
        done
+

diff --git a/lib/am/remake-hdr.am b/lib/am/remake-hdr.am
index 680f7d6..870d80b 100644 (file)
--- a/lib/am/remake-hdr.am
+++ b/lib/am/remake-hdr.am
@@ -5,3 +5,4 @@ ${CONFIG_HEADER}.in: stamp-h.in
 stamp-h.in: configure.in ${ACLOCAL} ${ACCONFIG} ${CONFIG_TOP} ${CONFIG_BOT}
        cd $(srcdir); autoheader
        date > $(srcdir)/stamp-h.in
+

diff --git a/lib/am/subdirs.am b/lib/am/subdirs.am
index 52c2176..73a29db 100644 (file)
--- a/lib/am/subdirs.am
+++ b/lib/am/subdirs.am
@@ -7,9 +7,9 @@
 
 @SET_MAKE@
 
-all install install-info uninstall check tags TAGS info dvi:
+all install install-info uninstall check tags TAGS info dvi::
        for subdir in $(SUBDIRS); do \
-         echo making $@ in $$dir ; \
+         echo making $@ in $$subdir ; \
          (cd $$subdir; $(MAKE) $@); \
        done
 
@@ -37,3 +37,4 @@ distclean-local: clean-local
        rm -f ${CONFIG_H} stamp-h
 
 realclean-local: distclean-local
+

diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 5c3a034..7c2ea85 100644 (file)
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -1,9 +1,3 @@
-MAKEINFO = makeinfo
-TEXI2DVI = texi2dvi
-infodir = $(prefix)/info
-
-TEXFILES = *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.log *.pg *.toc *.tp *.vr
-
 .SUFFIXES: .texi .info .dvi
 .texi.info:
        $(MAKEINFO) $<
@@ -18,6 +12,7 @@ dvi: $(DVIS)
 install:: install-info
 
 install-info:
+       $(top_srcdir)/mkinstalldirs $(infodir)
        cd $(srcdir); for file in *.info*; do \
          $(INSTALL_DATA) $$file $(infodir)/$$file; \
        done

diff --git a/libraries.am b/libraries.am
index 80e4909..60ecb2c 100644 (file)
--- a/libraries.am
+++ b/libraries.am
@@ -1,6 +1,8 @@
-libdir = $(exec_prefix)/lib
+install:: install-libraries
+
+install-libraries:
+
+uninstall:: uninstall-libraries
+
+uninstall-libraries:
 
-AR = ar
-RANLIB = @RANLIB@
-ALLOCA = @ALLOCA@
-LIBOBJS = @LIBOBJS@

diff --git a/library.am b/library.am
index 1b467d6..ff57221 100644 (file)
--- a/library.am
+++ b/library.am
@@ -1,5 +1,5 @@
-lib@LIBRARY@.a: $(@LIBRARY@_OBJECTS)
+lib@LIBRARY@.a: $(@LIBRARY@_OBJECTS) @LIBOBJS@ @ALLOCA@
        rm -f lib@LIBRARY@.a
-       $(AR) cru lib@LIBRARY@.a $(@LIBRARY@_OBJECTS)
+       $(AR) cru lib@LIBRARY@.a $(@LIBRARY@_OBJECTS) @LIBOBJS@ @ALLOCA@
        $(RANLIB) lib@LIBRARY@.a
 

diff --git a/mans-vars.am b/mans-vars.am
index 7d10c7f..e61014f 100644 (file)
--- a/mans-vars.am
+++ b/mans-vars.am
@@ -1,5 +1,4 @@
 mandir = $(prefix)/man
-catdir = $(prefix)/cat
 
 NROFF = nroff
 

diff --git a/mans.am b/mans.am
index 598f1c8..11c0cfd 100644 (file)
--- a/mans.am
+++ b/mans.am
@@ -1,19 +1,15 @@
-mandir = $(prefix)/man
-catdir = $(prefix)/cat
-
-NROFF = nroff
-
 install:: install-man
 
 install-man:
        for man in $(MANS); do \
-         sect=`echo $$man|sed 's%.*\(\.[0-9][a-z]*\)$$%\1%'; \
-         inst=`basename $$man $sect|sed '$(transform)'`.$$sect; \
+         sect=`echo $$man|sed 's%.*\.\([0-9][a-z]*\)$$%\1%'`; \
+         inst=`basename $$man $$sect|sed '$(transform)'`$$sect; \
          mdir=$(mandir)/man$$sect; \
+         $(top_srcdir)/mkinstalldirs $(mdir); \
          echo installing $$man as $$mdir/$$inst; \
          $(INSTALL_DATA) $(srcdir)/$$man $$mdir/$$inst; \
-         if test -d $(catdir); then
-           cdir=$(mandir)/cat$$sect; \
+         cdir=$(mandir)/cat$$sect; \
+         if test -d $$cdir; then \
            echo formatting $$man as $$cdir/$$inst; \
            $(NROFF) -man $(srcdir)/$$man > $$cdir/$$inst; \
          fi; \
@@ -29,3 +25,4 @@ uninstall-man:
          cdir=$(mandir)/cat$$sect; \
          rm -f $$mdir/$$inst $$cdir/$$inst; \
        done
+

diff --git a/programs.am b/programs.am
index 15c8e51..fe52780 100644 (file)
--- a/programs.am
+++ b/programs.am
@@ -1,17 +1,15 @@
-bindir = $(exec_prefix)/bin
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-
 install:: install-programs
 
 install-programs: $(PROGRAMS)
-        for p in $(PROGRAMS); do \
-          $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
-        done
+       $(top_srcdir)/mkinstalldirs $(bindir)
+       for p in $(PROGRAMS); do \
+         $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
+       done
 
 uninstall:: uninstall-programs
 
 uninstall-programs:
-        for p in $(PROGRAMS); do \
-          rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \
-        done
+       for p in $(PROGRAMS); do \
+         rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \
+       done
+

diff --git a/remake-hdr.am b/remake-hdr.am
index 680f7d6..870d80b 100644 (file)
--- a/remake-hdr.am
+++ b/remake-hdr.am
@@ -5,3 +5,4 @@ ${CONFIG_HEADER}.in: stamp-h.in
 stamp-h.in: configure.in ${ACLOCAL} ${ACCONFIG} ${CONFIG_TOP} ${CONFIG_BOT}
        cd $(srcdir); autoheader
        date > $(srcdir)/stamp-h.in
+

diff --git a/remake-subd.am b/remake-subd.am
index 3bdc5db..c5b9d80 100644 (file)
--- a/remake-subd.am
+++ b/remake-subd.am
@@ -1,2 +1,3 @@
 Makefile: ../config.status Makefile.in
        cd ..; CONFIG_FILES=src/$@ CONFIG_HEADERS= ./config.status
+

diff --git a/remake.am b/remake.am
index a754005..2e1b17b 100644 (file)
--- a/remake.am
+++ b/remake.am
@@ -6,3 +6,4 @@ config.status: configure
        ./config.status --recheck
 configure: configure.in ${ACLOCAL}
        cd $(srcdir); autoconf
+

diff --git a/subdirs.am b/subdirs.am
index 52c2176..73a29db 100644 (file)
--- a/subdirs.am
+++ b/subdirs.am
@@ -7,9 +7,9 @@
 
 @SET_MAKE@
 
-all install install-info uninstall check tags TAGS info dvi:
+all install install-info uninstall check tags TAGS info dvi::
        for subdir in $(SUBDIRS); do \
-         echo making $@ in $$dir ; \
+         echo making $@ in $$subdir ; \
          (cd $$subdir; $(MAKE) $@); \
        done
 
@@ -37,3 +37,4 @@ distclean-local: clean-local
        rm -f ${CONFIG_H} stamp-h
 
 realclean-local: distclean-local
+

diff --git a/texinfos.am b/texinfos.am
index 5c3a034..7c2ea85 100644 (file)
--- a/texinfos.am
+++ b/texinfos.am
@@ -1,9 +1,3 @@
-MAKEINFO = makeinfo
-TEXI2DVI = texi2dvi
-infodir = $(prefix)/info
-
-TEXFILES = *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.log *.pg *.toc *.tp *.vr
-
 .SUFFIXES: .texi .info .dvi
 .texi.info:
        $(MAKEINFO) $<
@@ -18,6 +12,7 @@ dvi: $(DVIS)
 install:: install-info
 
 install-info:
+       $(top_srcdir)/mkinstalldirs $(infodir)
        cd $(srcdir); for file in *.info*; do \
          $(INSTALL_DATA) $$file $(infodir)/$$file; \
        done