diff options
| -rw-r--r-- | share/mk/bsd.dep.mk | 4 | ||||
| -rw-r--r-- | share/mk/bsd.subdir.mk | 4 | ||||
| -rw-r--r-- | share/mk/sys.mk | 6 |
3 files changed, 6 insertions, 8 deletions
diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk index 2dc9c498077..55f75b06cb2 100644 --- a/share/mk/bsd.dep.mk +++ b/share/mk/bsd.dep.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.dep.mk,v 1.10 2012/08/31 11:46:09 espie Exp $ +# $OpenBSD: bsd.dep.mk,v 1.11 2012/10/15 11:14:38 espie Exp $ # $NetBSD: bsd.dep.mk,v 1.12 1995/09/27 01:15:09 christos Exp $ # some of the rules involve .h sources, so remove them from mkdep line @@ -52,4 +52,4 @@ cleandepend: rm -f .depend ${.CURDIR}/tags .endif -.PHONY: beforedepend depend afterdepend cleandepend subdirdepend +.PHONY: beforedepend depend afterdepend cleandepend realdepend diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk index 83833054d65..6fbaae26471 100644 --- a/share/mk/bsd.subdir.mk +++ b/share/mk/bsd.subdir.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.subdir.mk,v 1.18 2012/08/18 10:36:51 espie Exp $ +# $OpenBSD: bsd.subdir.mk,v 1.19 2012/10/15 11:14:38 espie Exp $ # $NetBSD: bsd.subdir.mk,v 1.11 1996/04/04 02:05:06 jtc Exp $ # @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91 @@ -43,7 +43,7 @@ _SUBDIRUSE: .USE exec ${MAKE} SKIPDIR="$${subskipdir}" \ $${_makefile_spec_} _THISDIR_="$${_nextdir_}" \ ${MAKE_FLAGS} \ - ${.TARGET:S/^real//:S/subdirdepend/depend/}; \ + ${.TARGET:S/^real//}; \ fi); \ done diff --git a/share/mk/sys.mk b/share/mk/sys.mk index 0e1be2f7477..a63b3f4facb 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -1,4 +1,4 @@ -# $OpenBSD: sys.mk,v 1.64 2012/06/20 21:40:55 deraadt Exp $ +# $OpenBSD: sys.mk,v 1.65 2012/10/15 11:14:38 espie Exp $ # $NetBSD: sys.mk,v 1.27 1996/04/10 05:47:19 mycroft Exp $ # @(#)sys.mk 5.11 (Berkeley) 3/13/91 @@ -16,8 +16,6 @@ OSrev= $(OSMAJOR)$(OSMINOR) .SUFFIXES: .out .a .o .c .cc .C .cxx .F .f .r .y .l .s .S .cl .p .h .sh .m4 -.LIBS: .a - AR?= ar ARFLAGS?= rl RANLIB?= ranlib @@ -49,7 +47,7 @@ CPP?= cpp CPPFLAGS?= FC?= f77 -FFLAGS?= -O2 +FFLAGS?= -O2 RFLAGS?= COMPILE.f?= ${FC} ${FFLAGS} -c LINK.f?= ${FC} ${FFLAGS} ${LDFLAGS} |