From owner-cvs-all Wed Apr 17 6:49:38 2002 Delivered-To: cvs-all@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 864BA37B404; Wed, 17 Apr 2002 06:49:29 -0700 (PDT) Received: (from ru@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3HDnTV73622; Wed, 17 Apr 2002 06:49:29 -0700 (PDT) (envelope-from ru) Message-Id: <200204171349.g3HDnTV73622@freefall.freebsd.org> From: Ruslan Ermilov Date: Wed, 17 Apr 2002 06:49:29 -0700 (PDT) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/share/mk bsd.doc.mk bsd.docb.mk bsd.info.mk bsd.init.mk bsd.lib.mk bsd.libnames.mk bsd.man.mk bsd.nls.mk bsd.obj.mk bsd.own.mk bsd.prog.mk bsd.sgml.mk bsd.subdir.mk sys.mk X-FreeBSD-CVS-Branch: HEAD Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG ru 2002/04/17 06:49:29 PDT Modified files: share/mk bsd.doc.mk bsd.docb.mk bsd.info.mk bsd.lib.mk bsd.libnames.mk bsd.man.mk bsd.nls.mk bsd.obj.mk bsd.own.mk bsd.prog.mk bsd.sgml.mk bsd.subdir.mk sys.mk Added files: share/mk bsd.init.mk Log: Don't include bsd.own.mk from sys.mk, this makes it impossible to use ``.if defined()'' inside bsd.own.mk to test for defines in individual makefiles. For example, setting DEBUG_FLAGS in Makefile didn't take the desired effect on the STRIP assignment. Added bsd.init.mk (like in NetBSD) that handles the inclusion of ../Makefile.inc and bsd.own.mk from all bsd.*.mk files that "build something". Back out bsd.own.mk,v 1.15: moved OBJFORMAT initialization back to sys.mk (several source tree makefiles want to check it early) and removed MACHINE_ARCH initialization (it's hard to see from looking at the commitlogs what the problem was at the time, but now it serves no purpose). Prohibit the direct inclusion of bsd.man.mk and bsd.libnames.mk. Protect bsd.obj.mk from repetitive inclusion. Prohibiting the direct inclusion of bsd.obj.mk might be a good idea too. Revision Changes Path 1.50 +1 -7 src/share/mk/bsd.doc.mk 1.5 +1 -8 src/share/mk/bsd.docb.mk 1.61 +1 -8 src/share/mk/bsd.info.mk 1.1 +14 -0 src/share/mk/bsd.init.mk (new) 1.108 +1 -8 src/share/mk/bsd.lib.mk 1.56 +4 -0 src/share/mk/bsd.libnames.mk 1.45 +4 -0 src/share/mk/bsd.man.mk 1.5 +2 -2 src/share/mk/bsd.nls.mk 1.40 +6 -0 src/share/mk/bsd.obj.mk 1.33 +0 -16 src/share/mk/bsd.own.mk 1.111 +1 -7 src/share/mk/bsd.prog.mk 1.30 +2 -9 src/share/mk/bsd.sgml.mk 1.34 +1 -8 src/share/mk/bsd.subdir.mk 1.60 +10 -1 src/share/mk/sys.mk To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message