* Makefile.am (DISTCLEANFILES): Add site.exp and site.bak.

	(MOSTLYCLEANFILES): Add binutils.log, binutils.sum, and abcdefgh*.
	(mostlyclean-local): New target.
	* Makefile.in: Rebuild.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 56f1946a7ae2c03d43474060c99088a59248bd06..146b5f5bd2d1db5d581f22c29405db196276c94f 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,18 @@
+Fri Apr  3 14:48:42 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+       * Makefile.am (DISTCLEANFILES): Add site.exp and site.bak.
+       (MOSTLYCLEANFILES): Add binutils.log, binutils.sum, and abcdefgh*.
+       (mostlyclean-local): New target.
+       * Makefile.in: Rebuild.
+
+Wed Apr  1 15:54:16 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+       From Zack Weinberg <zack@rabi.phys.columbia.edu> and H.J. Lu
+       <hjl@gnu.org>:
+       * ar.c (usage): Mention S modifier.
+       (main): Add S modifier.
+       * ar.1, binutils.texi: Document S modifier.
+
 Wed Apr  1 13:11:23 1998  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
 
        * binutils.texi: Use @itemx for a secondary item in a table.

diff --git a/binutils/Makefile.am b/binutils/Makefile.am
index 0944f3c124e58a9eb3742c78ab6ac242e21bc648..62f5d0d0824597119aff311bc13115e117976e06 100644 (file)
--- a/binutils/Makefile.am
+++ b/binutils/Makefile.am
@@ -243,7 +243,8 @@ DISTSTUFF = arparse.c arparse.h arlex.c nlmheader.c sysinfo.c sysinfo.h \
        syslex.c deflex.c
 diststuff: $(DISTSTUFF) info
 
-DISTCLEANFILES = stamp-under sysinfo underscore.c sysroff.c sysroff.h
+DISTCLEANFILES = stamp-under sysinfo underscore.c sysroff.c sysroff.h \
+       site.exp site.bak
 
 # Targets to rebuild dependencies in this Makefile.
 # Have to get rid of .dep1 here so that "$?" later includes all of $(CFILES).
@@ -260,10 +261,12 @@ DISTCLEANFILES = stamp-under sysinfo underscore.c sysroff.c sysroff.h
        $(SHELL) $(srcdir)/../move-if-change .dep2 .dep1
 
 dep.sed: dep-in.sed config.status
+       objdir=`pwd`; \
        sed <$(srcdir)/dep-in.sed >dep.sed      \
                -e 's!@INCDIR@!$(INCDIR)!'      \
                -e 's!@BFDDIR@!$(BFDDIR)!'      \
-               -e 's!@SRCDIR@!$(srcdir)!'
+               -e 's!@SRCDIR@!$(srcdir)!'      \
+               -e "s!@OBJDIR@!$${objdir}!"
 
 dep: .dep
        sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < Makefile > tmp-Makefile
@@ -296,7 +299,10 @@ $(DEMANGLER_PROG).1: cxxfilt.man Makefile
        sed -e 's/@PROGRAM@/$(DEMANGLER_PROG)/' < $(srcdir)/cxxfilt.man \
                > $(DEMANGLER_PROG).1
 
-MOSTLYCLEANFILES = sysinfo $(DEMANGLER_PROG).1
+MOSTLYCLEANFILES = sysinfo $(DEMANGLER_PROG).1 binutils.log binutils.sum \
+       abcdefgh*
+mostlyclean-local:
+       -rm -rf tmpdir
 
 CLEANFILES = dep.sed .dep .dep1
 

diff --git a/binutils/Makefile.in b/binutils/Makefile.in
index e19d008e646f0f6f90d7490b0ef54f4432dc6d65..e0001b2d2ee11b955740b1deb86e4f4c256bfe17 100644 (file)
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -238,9 +238,11 @@ windres_LDADD = $(BFDLIB) $(LIBIBERTY) @LEXLIB@
 DISTSTUFF = arparse.c arparse.h arlex.c nlmheader.c sysinfo.c sysinfo.h \
        syslex.c deflex.c
 
-DISTCLEANFILES = stamp-under sysinfo underscore.c sysroff.c sysroff.h
+DISTCLEANFILES = stamp-under sysinfo underscore.c sysroff.c sysroff.h \
+       site.exp site.bak
 
-MOSTLYCLEANFILES = sysinfo $(DEMANGLER_PROG).1
+MOSTLYCLEANFILES = sysinfo $(DEMANGLER_PROG).1 binutils.log binutils.sum \
+       abcdefgh*
 
 CLEANFILES = dep.sed .dep .dep1
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -866,7 +868,7 @@ maintainer-clean-generic:
 mostlyclean:  mostlyclean-hdr mostlyclean-binPROGRAMS \
                mostlyclean-noinstPROGRAMS mostlyclean-compile \
                mostlyclean-libtool mostlyclean-aminfo mostlyclean-tags \
-               mostlyclean-generic
+               mostlyclean-generic mostlyclean-local
 
 clean:  clean-hdr clean-binPROGRAMS clean-noinstPROGRAMS clean-compile \
                clean-libtool clean-aminfo clean-tags clean-generic \
@@ -1002,10 +1004,12 @@ diststuff: $(DISTSTUFF) info
        $(SHELL) $(srcdir)/../move-if-change .dep2 .dep1
 
 dep.sed: dep-in.sed config.status
+       objdir=`pwd`; \
        sed <$(srcdir)/dep-in.sed >dep.sed      \
                -e 's!@INCDIR@!$(INCDIR)!'      \
                -e 's!@BFDDIR@!$(BFDDIR)!'      \
-               -e 's!@SRCDIR@!$(srcdir)!'
+               -e 's!@SRCDIR@!$(srcdir)!'      \
+               -e "s!@OBJDIR@!$${objdir}!"
 
 dep: .dep
        sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < Makefile > tmp-Makefile
@@ -1037,6 +1041,8 @@ binutils.info: $(srcdir)/binutils.texi config.texi
 $(DEMANGLER_PROG).1: cxxfilt.man Makefile
        sed -e 's/@PROGRAM@/$(DEMANGLER_PROG)/' < $(srcdir)/cxxfilt.man \
                > $(DEMANGLER_PROG).1
+mostlyclean-local:
+       -rm -rf tmpdir
 
 .PHONY: install-exec-local