Add $Id$ to all files, remove $Log$ cruft.

Fix obj target so that the right things happen when the sources are
not rooted at /usr/src (add missing ^ and remove extra /).

diff --git a/share/mk/Makefile b/share/mk/Makefile
index aa88057..dd11498 100644 (file)
--- a/share/mk/Makefile
+++ b/share/mk/Makefile
@@ -1,4 +1,5 @@
-#      @(#)Makefile    5.3 (Berkeley) 6/22/90
+#      from: @(#)Makefile      5.3 (Berkeley) 6/22/90
+#      $Id$

 
 FILES= bsd.README bsd.dep.mk bsd.doc.mk bsd.lib.mk bsd.man.mk bsd.own.mk \
        bsd.prog.mk bsd.subdir.mk sys.mk
 
 FILES= bsd.README bsd.dep.mk bsd.doc.mk bsd.lib.mk bsd.man.mk bsd.own.mk \
        bsd.prog.mk bsd.subdir.mk sys.mk

diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index bcefe67..79f65e9 100644 (file)
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -1,4 +1,5 @@
-#      @(#)bsd.README  5.1 (Berkeley) 5/11/90
+#      from:@(#)bsd.README     5.1 (Berkeley) 5/11/90
+#      $Id$

 
 This is the README file for the new make "include" files for the BSD
 source tree.  The files are installed in /usr/share/mk, and are, by
 
 This is the README file for the new make "include" files for the BSD
 source tree.  The files are installed in /usr/share/mk, and are, by

diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 556b69b..a5c2aa3 100644 (file)
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -1,131 +1,5 @@
-#      @(#)bsd.lib.mk  5.26 (Berkeley) 5/2/91
-#
-# $Log: bsd.lib.mk,v $
-# Revision 1.27  1993/12/24  01:55:15  jkh
-# 1.  Reinstated -x -r / -X -r stripping of local symbols.  This works now.
-#
-# 2.  Added back rules for selective building of _pic.a files
-#     (if INSTALL_PIC_ARCHIVE set) so that ld.so builds work again.
-#
-# 3.  Strip shared libs during install by default since symbols not used
-#     and only waste space.  If gdb someday starts using them, we'll take the -s
-#     back off or make it an option.
-#
-# Revision 1.26  1993/12/13  18:30:43  ats
-# Deleted a line with a superfluous "rm" in the clean target. The same
-# targets are already handled in the other "rm"s. Jordan was faster
-# for the missing rm of libc.so in cleandir :-).
-#
-# Revision 1.25  1993/12/12  16:51:22  jkh
-# Add profiled .m target
-#
-# Revision 1.24  1993/12/12  15:17:34  jkh
-# Removed <lib>_pic.a file rules - libs are now built directly from shared
-# objects, thus skipping a step and shaving some time off system compilation.
-#
-# Revision 1.23  1993/12/04  20:04:31  ats
-# Added rules for ".S" to ".o" etc. Added ".S" to the known suffixes.
-# This is necessary to change all .s to .S files in the libc to get
-# make depend running again.
-#
-# Revision 1.22  1993/11/13  20:19:14  paul
-# Commented out ALL ld -x -r lines.
-#
-# Revision 1.21  1993/11/12  00:01:30  paul
-# Commented out yet more ld -x -r lines
-#
-# Revision 1.20  1993/11/09  04:50:28  paul
-# Temporary fix to make src tree closer to useable.
-#
-# # XXX -- shouldn't need to comment these out  but there's something not quite
-# #        worked out with the new linker.
-# #       @${LD} -x -r ${.TARGET}
-# #       @mv a.out ${.TARGET}
-#
-# Revision 1.19  1993/11/07  09:14:44  paul
-# Added missing cleandir line for shared libs.
-#
-# Revision 1.18  1993/11/06  19:15:25  paul
-# Added missing $ to {CXX} in .cc.so
-#
-# Revision 1.17  1993/11/06  18:57:00  paul
-# Added missing $ before {AR} in .s.so
-#
-# Revision 1.16  1993/11/04  03:51:31  paul
-# Added support for building shared libs.
-#
-# Revision 1.15  1993/10/31  15:43:03  ljo
-# bsd.dep.mk wasn't installed. bsd.lib.mk was missing a "\" line
-# continuation character in afterdepend target.
-#
-# Revision 1.14  1993/10/31  03:33:46  paul
-# Added NetBSD's bsd.dep.mk
-#
-# Revision 1.13  1993/10/31  01:45:26  ljo
-# Re-enabled rules for .cc.o, .C.o, and .cxx.o. Re-enabled and fixed
-# depend rule for .C, .cc, and .cxx files. Now doesn't use the -+
-# option to mkdep, and handles -nostdinc++.
-#
-# Revision 1.12  1993/10/08  12:19:22  rgrimes
-# This fix is from Chris Demetriou
-# You need a SUFFIX: line that has nothing on it so that the built-in
-# SUFFIX rules get cleared.  This is why we did not build the c library
-# using the optimized assembler sources for the i386.
-#
-# You need to make clean in src/lib/libc and rebuild libc, then relink
-# the rest of the world for this fix to take effect.
-#
-# Revision 1.11  1993/08/15  01:27:28  nate
-# 1) Finishedup my DPSRCS fixes from way back.  Now any .h files will
-#    automatically be depended and stripped out of the SRCS line
-#    (I also left the external definition as well, in case of non-src
-#     dependencies)
-#
-# 2) Cleaned up some of the clean/cleandirs to have a more pleasing format
-#    (rm -f on every line rather than line-continuations)
-#
-# 3) Added Charles Hannum's dependency fixes for a cleaner make depend that
-#    works for both c/c++ files
-#
-# 4) Added default targets for (file.cc|cxx|C) -> file.o in the all
-#    affected make macros.  However, these as well as Charles c++
-#    dependency fixes are commented out so that groff won't be broken.
-#    I'll uncomment them after further testing on my box and seeing if
-#    groff should be modified rather than relying on gcc2 doing the right
-#    thing (subject to group vote)
-#
-# Revision 1.10  1993/08/11  03:15:20  alm
-# added rules .f.po (and .f.o) from Jonas.
-#
-# Revision 1.9  1993/08/05  18:45:53  nate
-# Removed the ranlib statements from before the install (since it's done
-# after the install as well), and changed ranlib -> ${RANLIB}
-#
-# Revision 1.8  1993/08/03  20:57:34  nate
-# Fixed macros so that you can do a
-# make maninstall at all times and have it not blow up
-#
-# Revision 1.7  1993/07/23  20:44:38  nate
-# Fixed a boo-boo and made the NOMAN environment variable work correctly with
-# both programs and libraries.
-#
-# Revision 1.6  1993/07/09  00:38:35  jkh
-# Removed $History$ line from hell (no leading #).
-#
-# Revision 1.5  1993/07/08  12:17:07  paul
-# Removed the core.* before disaster strikes.
-# I removed core as well since it's pretty redundant.
-#
-# Revision 1.4  1993/07/07  21:42:45  nate
-# Cleaned up header files and added core.* to clean directives
-#
-# Revision 1.3  1993/07/02  06:44:30  root
-# New manual page system
-#
-# Revision 1.2  1993/06/17  02:01:11  rgrimes
-# Make clean in src/lib/libc failed due to too many arguments to /bin/sh,
-# this was fixed for make cleandir in the patchkit, this fixes it for
-# make clean.
+#      from: @(#)bsd.lib.mk    5.26 (Berkeley) 5/2/91
+#      $Id$

 #
 
 .if exists(${.CURDIR}/../Makefile.inc)
 #
 
 .if exists(${.CURDIR}/../Makefile.inc)


@@ -382,7 +256,7 @@ obj:
 .else
 obj:
        @cd ${.CURDIR}; rm -rf obj; \
 .else
 obj:
        @cd ${.CURDIR}; rm -rf obj; \

-       here=`pwd`; dest=/usr/obj/`echo $$here | sed 's,/usr/src/,,'`; \
+       here=`pwd`; dest=/usr/obj`echo $$here | sed 's,^/usr/src,,'`; \

        echo "$$here -> $$dest"; ln -s $$dest obj; \
        if test -d /usr/obj -a ! -d $$dest; then \
                mkdir -p $$dest; \
        echo "$$here -> $$dest"; ln -s $$dest obj; \
        if test -d /usr/obj -a ! -d $$dest; then \
                mkdir -p $$dest; \

diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
index 8abe4d3..ebe6c6a 100644 (file)
--- a/share/mk/bsd.man.mk
+++ b/share/mk/bsd.man.mk
@@ -1,4 +1,5 @@
-#      @(#)bsd.man.mk  5.2 (Berkeley) 5/11/90
+#      from: @(#)bsd.man.mk    5.2 (Berkeley) 5/11/90
+#      $Id$

 
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
 
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"

diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 78b9a46..502cf8d 100644 (file)
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-#      @(#)bsd.own.mk  0.1 (RGrimes) 4/4/93
+#      $Id$

 
 BINGRP?=       bin
 BINOWN?=       bin
 
 BINGRP?=       bin
 BINOWN?=       bin

diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index edd3679..4576573 100644 (file)
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -1,4 +1,5 @@
-#      @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
+#      from: @(#)bsd.prog.mk   5.26 (Berkeley) 6/25/91
+#      $Id$

 
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
 
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"


@@ -170,7 +171,7 @@ obj: _PROGSUBDIR
 .else
 obj: _PROGSUBDIR
        @cd ${.CURDIR}; rm -rf obj; \
 .else
 obj: _PROGSUBDIR
        @cd ${.CURDIR}; rm -rf obj; \

-       here=`pwd`; dest=/usr/obj/`echo $$here | sed 's,/usr/src/,,'`; \
+       here=`pwd`; dest=/usr/obj`echo $$here | sed 's,^/usr/src,,'`; \

        echo "$$here -> $$dest"; ln -s $$dest obj; \
        if test -d /usr/obj -a ! -d $$dest; then \
                mkdir -p $$dest; \
        echo "$$here -> $$dest"; ln -s $$dest obj; \
        if test -d /usr/obj -a ! -d $$dest; then \
                mkdir -p $$dest; \

diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk
index d5e35a1..901ab12 100644 (file)
--- a/share/mk/bsd.subdir.mk
+++ b/share/mk/bsd.subdir.mk
@@ -1,4 +1,5 @@
-#      @(#)bsd.subdir.mk       5.9 (Berkeley) 2/1/91
+#      from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91
+#      $Id$

 
 .MAIN: all
 
 
 .MAIN: all
 

diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index ac09dfc..d7f162f 100644 (file)
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -1,4 +1,5 @@
-#      @(#)sys.mk      5.11 (Berkeley) 3/13/91
+#      from: @(#)sys.mk        5.11 (Berkeley) 3/13/91
+#      $Id$

 
 unix=          We run UNIX.
 
 
 unix=          We run UNIX.