diff options
Diffstat (limited to 'share')
| -rw-r--r-- | share/Makefile | 42 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 41 |
2 files changed, 66 insertions, 17 deletions
diff --git a/share/Makefile b/share/Makefile index 5143ea8..4a5f0c4 100644 --- a/share/Makefile +++ b/share/Makefile @@ -12,20 +12,38 @@ SUBDIR= ${_colldef} \ ${_man} \ ${_me} \ misc \ - mk \ + ${_mk} \ ${_mklocale} \ ${_monetdef} \ ${_msgdef} \ ${_numericdef} \ ${_sendmail} \ skel \ - snmp \ + ${_snmp} \ ${_syscons} \ tabset \ termcap \ ${_timedef} \ ${_zoneinfo} +# NB: keep these sorted by MK_* knobs + +.if ${MK_BSNMP} != "no" +_snmp= snmp +.endif + +.if ${MK_DICT} != "no" +_dict= dict +.endif + +.if ${MK_EXAMPLES} != "no" +_examples= examples +.endif + +.if ${MK_GROFF} != "no" +_me= me +.endif + .if ${MK_LOCALES} != "no" _colldef = colldef _mklocale = mklocale @@ -35,26 +53,14 @@ _numericdef = numericdef _timedef = timedef .endif -.if ${MK_SYSCONS} != "no" -_syscons= syscons +.if ${MK_MAKE} != "no" +_mk= mk .endif .if ${MK_MAN} != "no" _man= man .endif -.if ${MK_GROFF} != "no" -_me= me -.endif - -.if ${MK_EXAMPLES} != "no" -_examples= examples -.endif - -.if ${MK_DICT} != "no" -_dict= dict -.endif - .if ${MK_SENDMAIL} != "no" _sendmail= sendmail .endif @@ -63,6 +69,10 @@ _sendmail= sendmail _doc= doc .endif +.if ${MK_SYSCONS} != "no" +_syscons= syscons +.endif + .if ${MK_ZONEINFO} != "no" _zoneinfo= zoneinfo .endif diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 6249084..5910a13 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -282,8 +282,12 @@ WITH_IDEA= # MK_* options which default to "yes". # .for var in \ + ACCT \ ACPI \ + AMD \ + APM \ ASSERT_DEBUG \ + AT \ ATM \ AUDIT \ AUTHPF \ @@ -297,18 +301,22 @@ WITH_IDEA= BLUETOOTH \ BOOT \ BSD_CPIO \ + BSNMP \ BZIP2 \ CALENDAR \ CDDL \ CPP \ CRYPT \ + CTM \ CVS \ CXX \ DICT \ DYNAMICROOT \ EXAMPLES \ + FLOPPY \ FORTH \ FP_LIBC \ + FREEBSD_UPDATE \ GAMES \ GCOV \ GDB \ @@ -321,40 +329,60 @@ WITH_IDEA= INFO \ INSTALLLIB \ IPFILTER \ + IPFW \ IPX \ + JAIL \ KERBEROS \ KVM \ + LEGACY_CONSOLE \ LIB32 \ LIBPTHREAD \ LIBTHR \ LOCALES \ + LOCATE \ LPR \ + MAIL \ MAILWRAPPER \ + MAKE \ MAN \ NCP \ + NDIS \ NETCAT \ + NETGRAPH \ NIS \ NLS \ NLS_CATALOGS \ NS_CACHING \ + NTP \ OBJC \ OPENSSH \ OPENSSL \ PAM \ PF \ + PKGTOOLS \ + PMC \ + PORTSNAP \ + PPP \ PROFILE \ + QUOTAS \ RCMDS \ RCS \ RESCUE \ + ROUTED \ SENDMAIL \ SETUID_LOGIN \ SHAREDOCS \ + SLIP \ SSP \ + SYSINSTALL \ SYMVER \ SYSCONS \ TCSH \ + TELNET \ + TEXTPROC \ TOOLCHAIN \ USB \ + WIRELESS \ WPA_SUPPLICANT_EAPOL \ ZFS \ ZONEINFO @@ -432,6 +460,11 @@ MK_KERBEROS:= no MK_NCP:= no .endif +.if ${MK_MAIL} == "no" +MK_MAILWRAPPER:= no +MK_SENDMAIL:= no +.endif + .if ${MK_OPENSSL} == "no" MK_OPENSSH:= no MK_KERBEROS:= no @@ -441,6 +474,10 @@ MK_KERBEROS:= no MK_AUTHPF:= no .endif +.if ${MK_TEXTPROC} == "no" +MK_GROFF:= no +.endif + .if ${MK_TOOLCHAIN} == "no" MK_GDB:= no .endif @@ -460,7 +497,9 @@ MK_GDB:= no IPX \ KERBEROS \ KVM \ - PAM + NETGRAPH \ + PAM \ + WIRELESS .if defined(WITH_${var}_SUPPORT) && defined(WITHOUT_${var}_SUPPORT) .error WITH_${var}_SUPPORT and WITHOUT_${var}_SUPPORT can't both be set. .endif |
