diff options
author | Ruslan Ermilov <ru@FreeBSD.org> | 2006-03-17 18:54:44 +0000 |
---|---|---|
committer | Ruslan Ermilov <ru@FreeBSD.org> | 2006-03-17 18:54:44 +0000 |
commit | e1fe3dba5ce2826061f6489765be9b4a341736a9 (patch) | |
tree | 801e953598fc63a37f62cf997017301675552fe9 /gnu | |
parent | 23801379f0e7cdddcb057ea05fe79b340a01dbf5 (diff) | |
download | src-test2-e1fe3dba5ce2826061f6489765be9b4a341736a9.tar.gz src-test2-e1fe3dba5ce2826061f6489765be9b4a341736a9.zip |
Notes
Diffstat (limited to 'gnu')
-rw-r--r-- | gnu/lib/Makefile | 8 | ||||
-rw-r--r-- | gnu/lib/libdialog/Makefile | 4 | ||||
-rw-r--r-- | gnu/usr.bin/Makefile | 20 | ||||
-rw-r--r-- | gnu/usr.bin/bc/Makefile | 4 | ||||
-rw-r--r-- | gnu/usr.bin/cc/Makefile | 14 | ||||
-rw-r--r-- | gnu/usr.bin/cc/cc_tools/Makefile | 10 | ||||
-rw-r--r-- | gnu/usr.bin/cvs/cvs/Makefile | 3 | ||||
-rw-r--r-- | gnu/usr.bin/dialog/Makefile | 4 |
8 files changed, 41 insertions, 26 deletions
diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile index 0e5b51c2641c..9e1584c9f200 100644 --- a/gnu/lib/Makefile +++ b/gnu/lib/Makefile @@ -1,18 +1,20 @@ # $FreeBSD$ +.include <bsd.own.mk> + SUBDIR= csu libgcc libgcov libdialog libregex libreadline # libsupc++ uses libstdc++ headers, although 'make includes' should # have taken care of that already. -.if !defined(NO_CXX) +.if ${MK_CXX} != "no" SUBDIR+= libstdc++ libsupc++ .endif -.if !defined(NO_OBJC) +.if ${MK_OBJC} != "no" SUBDIR+= libobjc .endif -.if !defined(NO_FORTRAN) +.if ${MK_FORTRAN} != "no" SUBDIR+= libg2c .endif diff --git a/gnu/lib/libdialog/Makefile b/gnu/lib/libdialog/Makefile index e2e171024bb0..2d725fa4c729 100644 --- a/gnu/lib/libdialog/Makefile +++ b/gnu/lib/libdialog/Makefile @@ -1,6 +1,8 @@ # Makefile for libdialog # $FreeBSD$ +.include <bsd.own.mk> + LIB= dialog INCS= dialog.h MAN= dialog.3 @@ -20,7 +22,7 @@ CFLAGS+= -I${.CURDIR} -Wall -Wstrict-prototypes -DLOCALE DPADD= ${LIBNCURSES} LDADD= -lncurses -.if !defined(NO_HTML) +.if ${MK_HTML} != "no" FILES= ${EXAMPLES:C;^;${.CURDIR}/TESTS/;} FILESDIR= ${SHAREDIR}/examples/libdialog .endif diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile index 9a15f01cbc91..1abf8f74d469 100644 --- a/gnu/usr.bin/Makefile +++ b/gnu/usr.bin/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +.include <bsd.own.mk> + SUBDIR= bc \ ${_binutils} \ ${_cc} \ @@ -23,38 +25,38 @@ SUBDIR= bc \ ${_texinfo} .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "powerpc" -NO_GDB= # not yet +MK_GDB= no # not yet .endif -.if !defined(NO_CXX) +.if ${MK_CXX} != "no" .if ${MACHINE_ARCH} != "powerpc" _gperf= gperf .endif -.if !defined(NO_GROFF) +.if ${MK_GROFF} != "no" _groff= groff .endif .endif -.if !defined(NO_CVS) +.if ${MK_CVS} != "no" _cvs= cvs .endif -.if !defined(NO_MAN) +.if ${MK_MAN} != "no" _man= man .endif -.if !defined(NO_INFO) +.if ${MK_INFO} != "no" _texinfo= texinfo .endif -.if !defined(NO_TOOLCHAIN) +.if ${MK_TOOLCHAIN} != "no" _binutils= binutils _cc= cc -.if !defined(NO_GDB) +.if ${MK_GDB} != "no" _gdb= gdb .endif .endif -.if !defined(NO_RCS) +.if ${MK_RCS} != "no" _rcs= rcs .endif diff --git a/gnu/usr.bin/bc/Makefile b/gnu/usr.bin/bc/Makefile index ed3838e9020e..74419f2d8d22 100644 --- a/gnu/usr.bin/bc/Makefile +++ b/gnu/usr.bin/bc/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +.include <bsd.own.mk> + BCDIR= ${.CURDIR}/../../../contrib/bc .PATH: ${BCDIR}/bc ${BCDIR}/lib ${BCDIR}/doc ${BCDIR}/Examples @@ -11,7 +13,7 @@ CFLAGS+=-DHAVE_CONFIG_H DPADD= ${LIBREADLINE} ${LIBTERMCAP} LDADD= -lreadline -ltermcap -.if !defined (NO_EXAMPLES) +.if ${MK_EXAMPLES} != "no" FILES= ckbook.b pi.b primes.b twins.b FILESDIR= ${SHAREDIR}/examples/bc .endif diff --git a/gnu/usr.bin/cc/Makefile b/gnu/usr.bin/cc/Makefile index d8ea8c26ae28..b1aa973a6987 100644 --- a/gnu/usr.bin/cc/Makefile +++ b/gnu/usr.bin/cc/Makefile @@ -1,30 +1,32 @@ # $FreeBSD$ +.include <bsd.own.mk> + # The order of some of these are rather important. Some depend on previous # subdirs. SUBDIR= cc_tools cc_int cc cc1 include protoize doc -.if !defined(NO_CPP) +.if ${MK_CPP} != "no" SUBDIR+= cpp .endif -.if !defined(NO_CXX) +.if ${MK_CXX} != "no" SUBDIR+= cc1plus c++ c++filt -.if !defined(NO_COLLECT2) +.if ${MK_COLLECT2} != "no" #SUBDIR+= collect2 .endif .endif -.if !defined(NO_OBJC) +.if ${MK_OBJC} != "no" SUBDIR+= cc1obj .endif -.if !defined(NO_FORTRAN) +.if ${MK_FORTRAN} != "no" SUBDIR+= f77 f771 f77doc .endif -.if !defined(NO_GCOV) +.if ${MK_GCOV} != "no" SUBDIR+= gcov .endif diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile index 78bdb690a0f8..31da5fb8f922 100644 --- a/gnu/usr.bin/cc/cc_tools/Makefile +++ b/gnu/usr.bin/cc/cc_tools/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +.include <bsd.own.mk> + # # This could probably be merged with ../cc_int/Makefile, but bsd.lib.mk # is such a !@#!*#% nightmare because of how it reprograms the dependencies, @@ -197,7 +199,7 @@ CLEANFILES+= gt-*.h gtype-*.h #----------------------------------------------------------------------- # Fortran build tools -.if !defined(NO_FORTRAN) +.if ${MK_FORTRAN} != "no" gen-time-stamp: fini fini: fini.o ${LIBIBERTY} ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} @@ -295,15 +297,15 @@ GTFILES = $(srcdir)/input.h $(srcdir)/coretypes.h $(srcdir)/cpplib.h \ # GTFILES_LANG_DIR_NAMES= -.if !defined(NO_CXX) +.if ${MK_CXX} != "no" GTFILES_LANG_DIR_NAMES+= cp .endif -.if !defined(NO_OBJC) +.if ${MK_OBJC} != "no" GTFILES_LANG_DIR_NAMES+= objc .endif -.if !defined(NO_FORTRAN) +.if ${MK_FORTRAN} != "no" GTFILES_LANG_DIR_NAMES+= f .endif diff --git a/gnu/usr.bin/cvs/cvs/Makefile b/gnu/usr.bin/cvs/cvs/Makefile index fa60444f6548..c5e2ff1f32d8 100644 --- a/gnu/usr.bin/cvs/cvs/Makefile +++ b/gnu/usr.bin/cvs/cvs/Makefile @@ -1,5 +1,6 @@ # $FreeBSD$ +.include <bsd.own.mk> .include "${.CURDIR}/../Makefile.inc" .PATH: ${CVSDIR}/src @@ -31,7 +32,7 @@ CFLAGS+= -I${.CURDIR} -I../lib -DHAVE_CONFIG_H -I${CVSDIR}/src \ DPADD= ${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ} LDADD= ${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz -.if !defined(NO_KERBEROS) && !defined(NO_OPENSSL) && !defined(NO_CRYPT) +.if ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -DHAVE_GSSAPI -DENCRYPTION LDADD+= -lgssapi -lkrb5 -lasn1 -lcrypto -lroken -lcrypt -lcom_err DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBROKEN} diff --git a/gnu/usr.bin/dialog/Makefile b/gnu/usr.bin/dialog/Makefile index 08c01584e2df..8e50ad3bd0d7 100644 --- a/gnu/usr.bin/dialog/Makefile +++ b/gnu/usr.bin/dialog/Makefile @@ -1,7 +1,9 @@ # Makefile for dialog # $FreeBSD$ -.if !defined (NO_EXAMPLES) +.include <bsd.own.mk> + +.if ${MK_EXAMPLES} != "no" SUBDIR= TESTS .endif |