usr.bin/make Makefile cleanup.
This is a multi-part message in MIME format.
--------------030903060706030904020601
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
o Reduce diffs between FreeBSD and DragonFly Makefile
o Add MAKE_VERSION variables
Max
--------------030903060706030904020601
Content-Type: text/plain;
name="patch-4.13"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="patch-4.13"
---------------------
Reduce diffs between FreeBSD and DragonFly Makefile
Index: Makefile
===================================================================
RCS file: /usr/home/okumoto/Work/make/fbsd-cvs/src/usr.bin/make/Makefile,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Makefile 18 May 2001 09:05:56 -0000 1.19
+++ Makefile 23 Mar 2002 23:30:30 -0000 1.20
@@ -1,7 +1,7 @@
PROG= make
-CFLAGS+= -I${.CURDIR}
+CFLAGS+=-I${.CURDIR}
SRCS= arch.c buf.c compat.c cond.c dir.c for.c hash.c job.c main.c \
make.c parse.c str.c suff.c targ.c util.c var.c var_modify.c
SRCS+= lstAppend.c lstAtEnd.c lstAtFront.c lstClose.c lstConcat.c \
lstDatum.c lstDeQueue.c lstDestroy.c lstDupl.c lstEnQueue.c \
lstFind.c lstFindFrom.c lstFirst.c lstForEach.c lstForEachFrom.c \
---------------------
PatchSet 230
Date: 2002/05/22 15:35:47
Author: ru
Log:
Added the MAKE_VERSION global that could be useful in determining
if a given make(1) is feature-compatible with a set of makefiles.
When merged, this will be used to replace the ugly upgrade_checks
hacks in src/Makefile.
Version has the RYYYYMMDDX format, where R is from RELENG_<R> and
X allows for 10 distinguishable changes per day.
Discussed with: bde
Members:
Makefile:1.21->1.22
main.c:1.58->1.59
Index: Makefile
===================================================================
RCS file: /usr/home/okumoto/Work/make/fbsd-cvs/src/usr.bin/make/Makefile,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Makefile 13 Apr 2002 10:57:56 -0000 1.21
+++ Makefile 22 May 2002 14:35:47 -0000 1.22
@@ -14,3 +14,7 @@
.PATH: ${.CURDIR}/lst.lib
NOSHARED?= YES
+
+CFLAGS+=-DMAKE_VERSION=\"5200205220\"
+
+main.o: ${MAKEFILE}
Index: main.c
===================================================================
RCS file: /usr/home/okumoto/Work/make/fbsd-cvs/src/usr.bin/make/main.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- main.c 21 May 2002 20:24:46 -0000 1.58
+++ main.c 22 May 2002 14:35:47 -0000 1.59
@@ -659,6 +659,9 @@
Var_Set("MACHINE", machine, VAR_GLOBAL);
Var_Set("MACHINE_ARCH", machine_arch, VAR_GLOBAL);
Var_Set("MACHINE_CPU", machine_cpu, VAR_GLOBAL);
+#ifdef MAKE_VERSION
+ Var_Set("MAKE_VERSION", MAKE_VERSION, VAR_GLOBAL);
+#endif
/*
* First snag any flags out of the MAKE environment variable.
---------------------
PatchSet 243
Date: 2002/06/17 14:43:15
Author: jmallett
Log:
make(I) appeared in PWB UNIX.
Members:
make.1:1.55->1.56
Index: make.1
===================================================================
RCS file: /usr/home/okumoto/Work/make/fbsd-cvs/src/usr.bin/make/make.1,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- make.1 30 May 2002 05:47:50 -0000 1.55
+++ make.1 17 Jun 2002 13:43:15 -0000 1.56
@@ -1258,5 +1258,4 @@
.Sh HISTORY
A
.Nm
-command appeared in
-.At v7 .
+command appeared in PWB UNIX.
--------------030903060706030904020601--