From owner-svn-src-all@FreeBSD.ORG Tue Nov 25 21:18:34 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 41A1E9F4; Tue, 25 Nov 2014 21:18:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2AE0493F; Tue, 25 Nov 2014 21:18:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAPLIYiY088818; Tue, 25 Nov 2014 21:18:34 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAPLIJHB088697; Tue, 25 Nov 2014 21:18:19 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201411252118.sAPLIJHB088697@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Tue, 25 Nov 2014 21:18:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r275077 - in head: gnu/lib/libdialog gnu/lib/libgcc gnu/lib/libreadline/readline gnu/lib/libstdc++ gnu/usr.bin/dialog gnu/usr.bin/diff gnu/usr.bin/gdb/gdb gnu/usr.bin/gdb/gdbtui gnu/usr... X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Nov 2014 21:18:34 -0000 Author: bapt Date: Tue Nov 25 21:18:18 2014 New Revision: 275077 URL: https://svnweb.freebsd.org/changeset/base/275077 Log: Convert to LIBADD Reduce overlinking Modified: head/gnu/lib/libdialog/Makefile head/gnu/lib/libgcc/Makefile head/gnu/lib/libreadline/readline/Makefile head/gnu/lib/libstdc++/Makefile head/gnu/usr.bin/dialog/Makefile head/gnu/usr.bin/diff/Makefile head/gnu/usr.bin/gdb/gdb/Makefile head/gnu/usr.bin/gdb/gdbtui/Makefile head/gnu/usr.bin/gdb/kgdb/Makefile head/gnu/usr.bin/grep/Makefile head/libexec/atf/atf-check/Makefile head/libexec/atf/atf-sh/Makefile head/libexec/atrun/Makefile head/libexec/casper/dns/Makefile head/libexec/casper/grp/Makefile head/libexec/casper/pwd/Makefile head/libexec/casper/random/Makefile head/libexec/casper/sysctl/Makefile head/libexec/dma/Makefile head/libexec/fingerd/Makefile head/libexec/ftpd/Makefile head/libexec/getty/Makefile head/libexec/mail.local/Makefile head/libexec/pppoed/Makefile head/libexec/rlogind/Makefile head/libexec/rpc.rquotad/Makefile head/libexec/rpc.rstatd/Makefile head/libexec/rpc.rusersd/Makefile head/libexec/rpc.rwalld/Makefile head/libexec/rpc.sprayd/Makefile head/libexec/rshd/Makefile head/libexec/rtld-elf/Makefile head/libexec/smrsh/Makefile head/libexec/tcpd/Makefile head/libexec/telnetd/Makefile head/libexec/tftpd/Makefile head/libexec/ulog-helper/Makefile head/libexec/ypxfr/Makefile head/secure/lib/libssh/Makefile head/secure/lib/libssl/Makefile head/secure/libexec/sftp-server/Makefile head/secure/libexec/ssh-keysign/Makefile head/secure/libexec/ssh-pkcs11-helper/Makefile head/secure/usr.bin/bdes/Makefile head/secure/usr.bin/openssl/Makefile head/secure/usr.bin/scp/Makefile head/secure/usr.bin/sftp/Makefile head/secure/usr.bin/ssh-add/Makefile head/secure/usr.bin/ssh-agent/Makefile head/secure/usr.bin/ssh-keygen/Makefile head/secure/usr.bin/ssh-keyscan/Makefile head/secure/usr.bin/ssh/Makefile head/secure/usr.sbin/sshd/Makefile Modified: head/gnu/lib/libdialog/Makefile ============================================================================== --- head/gnu/lib/libdialog/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/gnu/lib/libdialog/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -13,8 +13,7 @@ SRCS= argv.c arrows.c buildlist.c butto INCS= dialog.h dlg_colors.h dlg_config.h dlg_keys.h MAN= dialog.3 -DPADD= ${LIBNCURSESW} ${LIBM} -LDADD= -lncursesw -lm +LIBADD= ncursesw m CFLAGS+= -I${.CURDIR} -I${DIALOG} -D_XOPEN_SOURCE_EXTENDED -DGCC_UNUSED=__unused .PATH: ${DIALOG} Modified: head/gnu/lib/libgcc/Makefile ============================================================================== --- head/gnu/lib/libgcc/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/gnu/lib/libgcc/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -28,8 +28,7 @@ CFLAGS+= -DIN_GCC -DIN_LIBGCC2 -D__GCC_F -I${.CURDIR}/../../usr.bin/cc/cc_tools LDFLAGS+= -nodefaultlibs -DPADD+= ${LIBC} -LDADD+= -lc +LIBADD+= c OBJS= # added to below in various ways depending on TARGET_CPUARCH @@ -119,8 +118,7 @@ LIB1ASMSRC = lib1funcs.asm LIB1ASMFUNCS = _dvmd_tls _bb_init_func LIB2ADDEH = unwind-arm.c libunwind.S pr-support.c unwind-c.c # Some compilers generate __aeabi_ functions libgcc_s is missing -DPADD+= ${LIBCOMPILER_RT} -LDADD+= -lcompiler_rt +LIBADD+= compiler_rt .endif .if ${TARGET_CPUARCH} == mips Modified: head/gnu/lib/libreadline/readline/Makefile ============================================================================== --- head/gnu/lib/libreadline/readline/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/gnu/lib/libreadline/readline/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -23,7 +23,6 @@ ${.OBJDIR}/${_h}: ${SRCDIR}/${_h} ${INSTALL} ${.ALLSRC} ${.TARGET} .endfor -DPADD= ${LIBTERMCAPW} -LDADD= -ltermcapw +LIBADD= ncursesw .include Modified: head/gnu/lib/libstdc++/Makefile ============================================================================== --- head/gnu/lib/libstdc++/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/gnu/lib/libstdc++/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -23,8 +23,8 @@ CXXFLAGS+= -fno-implicit-templates -ffun -Wno-deprecated PO_CXXFLAGS= ${CXXFLAGS:N-ffunction-sections} -DPADD= ${LIBM} -LDADD= -lm -Wl,-f,libsupc++.so.1 +LIBADD+= m +LDADD= -Wl,-f,libsupc++.so.1 # libstdc++ sources SRCS+= bitmap_allocator.cc pool_allocator.cc \ Modified: head/gnu/usr.bin/dialog/Makefile ============================================================================== --- head/gnu/usr.bin/dialog/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/gnu/usr.bin/dialog/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -3,8 +3,7 @@ DIALOG= ${.CURDIR}/../../../contrib/dialog PROG= dialog -DPADD= ${LIBDIALOG} ${LIBNCURSESW} ${LIBM} -LDADD= -ldialog -lncursesw -lm +LIBADD= dialog ncursesw m CFLAGS+= -I${.CURDIR} -I${DIALOG} .PATH: ${DIALOG} Modified: head/gnu/usr.bin/diff/Makefile ============================================================================== --- head/gnu/usr.bin/diff/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/gnu/usr.bin/diff/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -26,8 +26,7 @@ CFLAGS+=-I${DESTDIR}/usr/include/gnu SUBDIR+=doc -DPADD= ${LIBGNUREGEX} -LDADD= -lgnuregex +LIBADD+= gnuregex .if ${MK_TESTS} != "no" SUBDIR+= tests Modified: head/gnu/usr.bin/gdb/gdb/Makefile ============================================================================== --- head/gnu/usr.bin/gdb/gdb/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/gnu/usr.bin/gdb/gdb/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -11,8 +11,9 @@ GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a # global symbols visible. LDFLAGS+= -Wl,-E -DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} ${LIBGNUREGEX} -LDADD= ${GDBLIBS} ${BULIBS} -lm ${LDREADLINE} -ltermcapw -lgnuregex +DPADD= ${GDBLIBS} ${BULIBS} +LDADD= ${GDBLIBS} ${BULIBS} +LIBADD+= m readline ncursesw gnuregex .include CFLAGS+= -DDEBUGDIR=\"${DEBUGDIR}\" Modified: head/gnu/usr.bin/gdb/gdbtui/Makefile ============================================================================== --- head/gnu/usr.bin/gdb/gdbtui/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/gnu/usr.bin/gdb/gdbtui/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -12,7 +12,8 @@ GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a # global symbols visible. LDFLAGS+= -Wl,-E -DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} ${LIBGNUREGEX} -LDADD= ${GDBLIBS} ${BULIBS} -lm ${LDREADLINE} -ltermcapw -lgnuregex +DPADD= ${GDBLIBS} ${BULIBS} +LDADD= ${GDBLIBS} ${BULIBS} +LIBADD+= m readline ncursesw gnuregex .include Modified: head/gnu/usr.bin/gdb/kgdb/Makefile ============================================================================== --- head/gnu/usr.bin/gdb/kgdb/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/gnu/usr.bin/gdb/kgdb/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -8,10 +8,9 @@ BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_ ${OBJ_BU}/libiberty/libiberty.a GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a -DPADD= ${GDBLIBS} ${BULIBS} ${LIBKVM} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} \ - ${LIBGNUREGEX} -LDADD= ${GDBLIBS} ${BULIBS} -lkvm${GDB_SUFFIX} -lm ${LDREADLINE} -ltermcapw \ - -lgnuregex +DPADD= ${GDBLIBS} ${BULIBS} ${LIBKVM} +LDADD= ${GDBLIBS} ${BULIBS} -lkvm${GDB_SUFFIX} +LIBADD+= m readline ncursesw gnuregex .if defined(GDB_CROSS_DEBUGGER) CFLAGS+= -Wl,-export-dynamic Modified: head/gnu/usr.bin/grep/Makefile ============================================================================== --- head/gnu/usr.bin/grep/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/gnu/usr.bin/grep/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -22,8 +22,7 @@ LINKS+= ${BINDIR}/grep ${BINDIR}/egrep \ MLINKS= grep.1 egrep.1 grep.1 fgrep.1 .endif -DPADD= ${LIBGNUREGEX} ${LIBBZ2} -LDADD= -lgnuregex -lbz2 +LIBADD= gnuregex bz2 .if ${MK_BSD_GREP} != "yes" LINKS+= ${BINDIR}/grep ${BINDIR}/bzgrep \ @@ -33,8 +32,7 @@ MLINKS+=grep.1 bzgrep.1 grep.1 bzegrep.1 .endif .if defined(GREP_LIBZ) && !empty(GREP_LIBZ) -LDADD+= -lz -DPADD+= ${LIBZ} +LIBADD+= z CFLAGS+=-DHAVE_LIBZ=1 .if ${MK_BSD_GREP} != "yes" LINKS+= ${BINDIR}/grep ${BINDIR}/zgrep \ Modified: head/libexec/atf/atf-check/Makefile ============================================================================== --- head/libexec/atf/atf-check/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/libexec/atf/atf-check/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -38,9 +38,7 @@ MAN= atf-check.1 CFLAGS+= -I${ATF} CFLAGS+= -DATF_SHELL='"/bin/sh"' -DPADD+= ${LIBATF_CXX} ${LIBATF_C} -LDADD+= ${LDATF_CXX} ${LDATF_C} -USEPRIVATELIB= atf-c++ atf-c +LIBADD= atf_cxx .if ${MK_TESTS} != "no" SUBDIR+= tests Modified: head/libexec/atf/atf-sh/Makefile ============================================================================== --- head/libexec/atf/atf-sh/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/libexec/atf/atf-sh/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -42,9 +42,7 @@ CFLAGS+= -DATF_PKGDATADIR='"${SHAREDIR}/ CFLAGS+= -DATF_SHELL='"/bin/sh"' CFLAGS+= -I${ATF} -DPADD+= ${LIBATF_C} ${LIBATF_CXX} -LDADD+= ${LDATF_C} ${LDATF_CXX} -USEPRIVATELIB= atf-c++ atf-c +LIBADD= atf_cxx FILESGROUPS= SUBR Modified: head/libexec/atrun/Makefile ============================================================================== --- head/libexec/atrun/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/libexec/atrun/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -17,8 +17,7 @@ CFLAGS+=-DLOGIN_CAP -DPAM WARNS?= 2 WFORMAT=0 -DPADD= ${LIBPAM} ${LIBUTIL} -LDADD= ${MINUSLPAM} -lutil +LIBADD= pam util atrun.8: atrun.man @${ECHO} Making ${.TARGET:T} from ${.ALLSRC:T}; \ Modified: head/libexec/casper/dns/Makefile ============================================================================== --- head/libexec/casper/dns/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/libexec/casper/dns/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -6,8 +6,7 @@ PROG= dns SRCS= dns.c -DPADD= ${LIBCAPSICUM} ${LIBCASPER} ${LIBNV} ${LIBPJDLOG} ${LIBUTIL} -LDADD= -lcapsicum -lcasper -lnv -lpjdlog -lutil +LIBADD= casper nv BINDIR= /libexec/casper Modified: head/libexec/casper/grp/Makefile ============================================================================== --- head/libexec/casper/grp/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/libexec/casper/grp/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -6,8 +6,7 @@ PROG= grp SRCS= grp.c -DPADD= ${LIBCAPSICUM} ${LIBCASPER} ${LIBNV} ${LIBPJDLOG} ${LIBUTIL} -LDADD= -lcapsicum -lcasper -lnv -lpjdlog -lutil +LIBADD= casper nv pjdlog BINDIR= /libexec/casper Modified: head/libexec/casper/pwd/Makefile ============================================================================== --- head/libexec/casper/pwd/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/libexec/casper/pwd/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -6,8 +6,7 @@ PROG= pwd SRCS= pwd.c -DPADD= ${LIBCAPSICUM} ${LIBCASPER} ${LIBNV} ${LIBPJDLOG} ${LIBUTIL} -LDADD= -lcapsicum -lcasper -lnv -lpjdlog -lutil +LIBADD= casper nv pjdlog BINDIR= /libexec/casper Modified: head/libexec/casper/random/Makefile ============================================================================== --- head/libexec/casper/random/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/libexec/casper/random/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -6,8 +6,7 @@ PROG= random SRCS= random.c -DPADD= ${LIBCAPSICUM} ${LIBCASPER} ${LIBNV} ${LIBPJDLOG} ${LIBUTIL} -LDADD= -lcapsicum -lcasper -lnv -lpjdlog -lutil +LIBADD= casper nv BINDIR= /libexec/casper Modified: head/libexec/casper/sysctl/Makefile ============================================================================== --- head/libexec/casper/sysctl/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/libexec/casper/sysctl/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -6,8 +6,7 @@ PROG= sysctl SRCS= sysctl.c -DPADD= ${LIBCAPSICUM} ${LIBCASPER} ${LIBNV} ${LIBPJDLOG} ${LIBUTIL} -LDADD= -lcapsicum -lcasper -lnv -lpjdlog -lutil +LIBADD= casper nv pjdlog BINDIR= /libexec/casper Modified: head/libexec/dma/Makefile ============================================================================== --- head/libexec/dma/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/libexec/dma/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -8,8 +8,7 @@ CFLAGS= -I${.CURDIR}/../../contrib/dma \ -DLIBEXEC_PATH='"/usr/libexec"' -DDMA_VERSION='"v0.9+"' \ -DDMA_ROOT_USER='"mailnull"' \ -DDMA_GROUP='"mail"' -DPADD= ${LIBSSL} ${LIBCRYPTO} -LDADD= -lssl -lcrypto +LIBADD= ssl crypto PROG= dma SRCS= aliases_parse.y \ Modified: head/libexec/fingerd/Makefile ============================================================================== --- head/libexec/fingerd/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/libexec/fingerd/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -2,8 +2,7 @@ # $FreeBSD$ PROG= fingerd -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util MAN= fingerd.8 WARNS?= 2 Modified: head/libexec/ftpd/Makefile ============================================================================== --- head/libexec/ftpd/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/libexec/ftpd/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -13,19 +13,16 @@ YFLAGS= WARNS?= 2 WFORMAT=0 -DPADD= ${LIBUTIL} ${LIBCRYPT} -LDADD= -lutil -lcrypt +LIBADD= util crypt # XXX Kluge! Conversation mechanism needs to be fixed. -DPADD+= ${LIBOPIE} ${LIBMD} -LDADD+= -lopie -lmd +LIBADD+= opie md LSDIR= ../../bin/ls .PATH: ${.CURDIR}/${LSDIR} SRCS+= ls.c cmp.c print.c util.c CFLAGS+=-Dmain=ls_main -I${.CURDIR}/${LSDIR} -DPADD+= ${LIBM} -LDADD+= -lm +LIBADD+= m .if ${MK_INET6_SUPPORT} != "no" CFLAGS+=-DINET6 @@ -33,8 +30,7 @@ CFLAGS+=-DINET6 .if ${MK_PAM_SUPPORT} != "no" CFLAGS+=-DUSE_PAM -DPADD+= ${LIBPAM} -LDADD+= ${MINUSLPAM} +LIBADD+= pam .endif .include Modified: head/libexec/getty/Makefile ============================================================================== --- head/libexec/getty/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/libexec/getty/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -3,8 +3,7 @@ PROG= getty SRCS= main.c init.c subr.c chat.c -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util MAN= gettytab.5 ttys.5 getty.8 WARNS?= 1 Modified: head/libexec/mail.local/Makefile ============================================================================== --- head/libexec/mail.local/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/libexec/mail.local/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -12,11 +12,7 @@ CFLAGS+=-I${SENDMAIL_DIR}/include -I. WARNS?= 2 WFORMAT=0 -LIBSMDIR= ${.OBJDIR}/../../lib/libsm -LIBSM= ${LIBSMDIR}/libsm.a - -DPADD= ${LIBSM} -LDADD= ${LIBSM} +LIBADD= sm SRCS+= sm_os.h CLEANFILES+=sm_os.h Modified: head/libexec/pppoed/Makefile ============================================================================== --- head/libexec/pppoed/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/libexec/pppoed/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -1,8 +1,7 @@ # $FreeBSD$ PROG= pppoed -DPADD= ${LIBNETGRAPH} -LDADD= -lnetgraph +LIBADD= netgraph MAN= pppoed.8 WARNS?= 1 Modified: head/libexec/rlogind/Makefile ============================================================================== --- head/libexec/rlogind/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/libexec/rlogind/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -5,8 +5,7 @@ PROG= rlogind MAN= rlogind.8 -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util WARNS?= 2 .if ${MK_INET6_SUPPORT} != "no" Modified: head/libexec/rpc.rquotad/Makefile ============================================================================== --- head/libexec/rpc.rquotad/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/libexec/rpc.rquotad/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -4,7 +4,6 @@ PROG = rpc.rquotad SRCS = rquotad.c MAN = rpc.rquotad.8 -DPADD= ${LIBRPCSVC} ${LIBUTIL} -LDADD= -lrpcsvc -lutil +LIBADD= rpcsvc util .include Modified: head/libexec/rpc.rstatd/Makefile ============================================================================== --- head/libexec/rpc.rstatd/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/libexec/rpc.rstatd/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -4,8 +4,7 @@ PROG = rpc.rstatd SRCS = rstatd.c rstat_proc.c MAN = rpc.rstatd.8 -DPADD= ${LIBRPCSVC} ${LIBUTIL} ${LIBDEVSTAT} ${LIBKVM} -LDADD= -lrpcsvc -lutil -ldevstat -lkvm +LIBADD= rpcsvc devstat WARNS?= 1 Modified: head/libexec/rpc.rusersd/Makefile ============================================================================== --- head/libexec/rpc.rusersd/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/libexec/rpc.rusersd/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -4,8 +4,7 @@ PROG = rpc.rusersd SRCS = rusersd.c rusers_proc.c extern.h MAN = rpc.rusersd.8 -DPADD= ${LIBRPCSVC} ${LIBUTIL} -LDADD= -lrpcsvc -lutil +LIBADD= rpcsvc #.if exists(/usr/X11R6/include/X11/extensions/xidle.h) #CFLAGS+= -DXIDLE Modified: head/libexec/rpc.rwalld/Makefile ============================================================================== --- head/libexec/rpc.rwalld/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/libexec/rpc.rwalld/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -4,8 +4,7 @@ PROG = rpc.rwalld SRCS = rwalld.c MAN = rpc.rwalld.8 -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util WARNS?= 2 Modified: head/libexec/rpc.sprayd/Makefile ============================================================================== --- head/libexec/rpc.sprayd/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/libexec/rpc.sprayd/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -4,8 +4,7 @@ PROG = rpc.sprayd SRCS = sprayd.c MAN = rpc.sprayd.8 -DPADD= ${LIBRPCSVC} -LDADD= -lrpcsvc +LIBADD= rpcsvc WARNS?= 2 Modified: head/libexec/rshd/Makefile ============================================================================== --- head/libexec/rshd/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/libexec/rshd/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -7,7 +7,6 @@ MAN= rshd.8 WARNS?= 3 WFORMAT=0 -DPADD= ${LIBUTIL} ${LIBPAM} -LDADD= -lutil ${MINUSLPAM} +LIBADD= util pam .include Modified: head/libexec/rtld-elf/Makefile ============================================================================== --- head/libexec/rtld-elf/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/libexec/rtld-elf/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -43,16 +43,14 @@ CFLAGS+= -fpic .endif CFLAGS+= -DPIC $(DEBUG) LDFLAGS+= -shared -Wl,-Bsymbolic -DPADD= ${LIBC_PIC} -LDADD= -lc_pic +LIBADD= c_pic .if ${MACHINE_CPUARCH} == "arm" # Some of the required math functions (div & mod) are implemented in # libcompiler_rt on ARM. The library also needs to be placed first to be # correctly linked. As some of the functions are used before we have # shared libraries. -DPADD+= ${LIBCOMPILER_RT} -LDADD+= -lcompiler_rt +LIBADD+= compiler_rt .endif Modified: head/libexec/smrsh/Makefile ============================================================================== --- head/libexec/smrsh/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/libexec/smrsh/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -9,11 +9,7 @@ SRCS= smrsh.c MAN= smrsh.8 CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I. -LIBSMDIR= ${.OBJDIR}/../../lib/libsm -LIBSM= ${LIBSMDIR}/libsm.a - -DPADD= ${LIBSM} -LDADD= ${LIBSM} +LIBADD= sm WARNS?= 2 Modified: head/libexec/tcpd/Makefile ============================================================================== --- head/libexec/tcpd/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/libexec/tcpd/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -15,8 +15,7 @@ CFLAGS+=-DREAL_DAEMON_DIR=\"/usr/libexec CFLAGS+=-DINET6 .endif -DPADD= ${LIBWRAP} -LDADD= -lwrap +LIBADD= wrap WARNS?= 1 Modified: head/libexec/telnetd/Makefile ============================================================================== --- head/libexec/telnetd/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/libexec/telnetd/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -29,20 +29,17 @@ CFLAGS+= -I${TELNETDIR}/telnet LIBTELNET= ${.OBJDIR}/../../lib/libtelnet/libtelnet.a -DPADD= ${LIBUTIL} ${LIBTERMCAPW} ${LIBTELNET} -LDADD= -lutil -ltermcapw ${LIBTELNET} +LIBADD= telnet util ncursesw .if ${MK_OPENSSL} != "no" SRCS+= authenc.c CFLAGS+= -DAUTHENTICATION -DENCRYPTION -DPADD+= ${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} ${LIBPAM} -LDADD+= -lmp -lcrypto -lcrypt ${MINUSLPAM} +LIBADD+= mp crypto pam .endif .if ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -DKRB5 -DFORWARD -Dnet_write=telnet_net_write -DPADD+= ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} -LDADD+= -lkrb5 -lhx509 -lasn1 -lroken -lcom_err +LIBADD+= krb5 roken .endif .include Modified: head/libexec/tftpd/Makefile ============================================================================== --- head/libexec/tftpd/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/libexec/tftpd/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -7,7 +7,6 @@ SRCS= tftp-file.c tftp-io.c tftp-options SRCS+= tftpd.c WFORMAT=0 -DPADD= ${LIBWRAP} -LDADD= -lwrap +LIBADD= wrap .include Modified: head/libexec/ulog-helper/Makefile ============================================================================== --- head/libexec/ulog-helper/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/libexec/ulog-helper/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -5,7 +5,6 @@ BINOWN= root BINMODE=4555 MAN= -DPADD= ${LIBULOG} -LDADD= -lulog +LIBADD= ulog .include Modified: head/libexec/ypxfr/Makefile ============================================================================== --- head/libexec/ypxfr/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/libexec/ypxfr/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -16,8 +16,7 @@ CFLAGS+= -I. WARNS?= 2 WFORMAT=0 -DPADD= ${LIBRPCSVC} -LDADD= -lrpcsvc +LIBADD= rpcsvc CLEANFILES= ${GENSRCS} Modified: head/secure/lib/libssh/Makefile ============================================================================== --- head/secure/lib/libssh/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/secure/lib/libssh/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -34,17 +34,14 @@ SRCS+= getrrsetbyname.c LDNSDIR= ${.CURDIR}/../../../contrib/ldns CFLAGS+= -DHAVE_LDNS=1 -I${LDNSDIR} SRCS+= getrrsetbyname-ldns.c -DPADD+= ${LIBLDNS} -LDADD+= ${LDLDNS} -USEPRIVATELIB+= ldns +LIBADD+= ldns .endif CFLAGS+= -I${SSHDIR} -include ssh_namespace.h .if ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -include krb5_config.h -DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN} -LDADD+= -lgssapi -lkrb5 -lhx509 -lasn1 -lcom_err -lmd -lroken +LIBADD+= gssapi krb5 hx509 asn1 com_err md roken .endif .if ${MK_OPENSSH_NONE_CIPHER} != "no" @@ -53,8 +50,7 @@ CFLAGS+= -DNONE_CIPHER_ENABLED NO_LINT= -DPADD+= ${LIBCRYPTO} ${LIBCRYPT} ${LIBZ} -LDADD+= -lcrypto -lcrypt -lz +LIBADD+= crypto crypt z .include Modified: head/secure/lib/libssl/Makefile ============================================================================== --- head/secure/lib/libssl/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/secure/lib/libssl/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -21,8 +21,7 @@ SRCS= bio_ssl.c d1_both.c d1_clnt.c d1_e INCS= dtls1.h kssl.h srtp.h ssl.h ssl2.h ssl23.h ssl3.h tls1.h INCSDIR=${INCLUDEDIR}/openssl -DPADD= ${LIBCRYPTO} -LDADD= -lcrypto +LIBADD= crypto .include Modified: head/secure/libexec/sftp-server/Makefile ============================================================================== --- head/secure/libexec/sftp-server/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/secure/libexec/sftp-server/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -12,9 +12,7 @@ CFLAGS+=-I${SSHDIR} -include ssh_namespa SRCS+= roaming_dummy.c .endif -DPADD= ${LIBSSH} -LDADD= ${LDSSH} -USEPRIVATELIB= ssh +LIBADD= ssh .if ${MK_LDNS} != "no" CFLAGS+= -DHAVE_LDNS=1 @@ -23,8 +21,7 @@ CFLAGS+= -DHAVE_LDNS=1 #USEPRIVATELIB+= ldns .endif -DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD+= -lcrypt -lcrypto -lz +LIBADD+= crypto crypto z .include Modified: head/secure/libexec/ssh-keysign/Makefile ============================================================================== --- head/secure/libexec/ssh-keysign/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/secure/libexec/ssh-keysign/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -8,9 +8,7 @@ MAN= ssh-keysign.8 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h BINMODE=4555 -DPADD= ${LIBSSH} -LDADD= ${LDSSH} -USEPRIVATELIB= ssh +LIBADD= ssh .if ${MK_LDNS} != "no" CFLAGS+= -DHAVE_LDNS=1 @@ -19,8 +17,7 @@ CFLAGS+= -DHAVE_LDNS=1 #USEPRIVATELIB+= ldns .endif -DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD+= -lcrypt -lcrypto -lz +LIBADD+= crypt crypto z .include Modified: head/secure/libexec/ssh-pkcs11-helper/Makefile ============================================================================== --- head/secure/libexec/ssh-pkcs11-helper/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/secure/libexec/ssh-pkcs11-helper/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -12,9 +12,7 @@ CFLAGS+=-I${SSHDIR} -include ssh_namespa SRCS+= roaming_dummy.c .endif -DPADD= ${LIBSSH} -LDADD= ${LDSSH} -USEPRIVATELIB= ssh +LIBADD= ssh .if ${MK_LDNS} != "no" CFLAGS+= -DHAVE_LDNS=1 @@ -23,8 +21,7 @@ CFLAGS+= -DHAVE_LDNS=1 #USEPRIVATELIB+= ldns .endif -DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD+= -lcrypt -lcrypto -lz +LIBADD+= crypt crypto z .include Modified: head/secure/usr.bin/bdes/Makefile ============================================================================== --- head/secure/usr.bin/bdes/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/secure/usr.bin/bdes/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -5,7 +5,6 @@ PROG= bdes WARNS?= 2 -DPADD= ${LIBCRYPTO} -LDADD= -lcrypto +LIBADD= crypto .include Modified: head/secure/usr.bin/openssl/Makefile ============================================================================== --- head/secure/usr.bin/openssl/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/secure/usr.bin/openssl/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -2,8 +2,7 @@ PROG= openssl -DPADD= ${LIBSSL} ${LIBCRYPTO} -LDADD= -lssl -lcrypto +LIBADD= ssl crypto .if exists(Makefile.man) .include "Makefile.man" Modified: head/secure/usr.bin/scp/Makefile ============================================================================== --- head/secure/usr.bin/scp/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/secure/usr.bin/scp/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -11,9 +11,7 @@ CFLAGS+=-I${SSHDIR} -include ssh_namespa SRCS+= roaming_dummy.c .endif -DPADD= ${LIBSSH} -LDADD= ${LDSSH} -USEPRIVATELIB= ssh +LIBADD= ssh .if ${MK_LDNS} != "no" CFLAGS+= -DHAVE_LDNS=1 @@ -22,8 +20,7 @@ CFLAGS+= -DHAVE_LDNS=1 #USEPRIVATELIB+= ldns .endif -DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD+= -lcrypt -lcrypto -lz +LIBADD+= crypt crypto z .include Modified: head/secure/usr.bin/sftp/Makefile ============================================================================== --- head/secure/usr.bin/sftp/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/secure/usr.bin/sftp/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -11,9 +11,7 @@ CFLAGS+=-I${SSHDIR} -include ssh_namespa SRCS+= roaming_dummy.c .endif -DPADD= ${LIBSSH} ${LIBEDIT} ${LIBNCURSESW} -LDADD= ${LDSSH} -ledit -lncursesw -USEPRIVATELIB= ssh +LIBADD= ssh edit .if ${MK_LDNS} != "no" CFLAGS+= -DHAVE_LDNS=1 @@ -22,8 +20,7 @@ CFLAGS+= -DHAVE_LDNS=1 #USEPRIVATELIB+= ldns .endif -DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD+= -lcrypt -lcrypto -lz +LIABDD+= crypt crypto z .include Modified: head/secure/usr.bin/ssh-add/Makefile ============================================================================== --- head/secure/usr.bin/ssh-add/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/secure/usr.bin/ssh-add/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -11,9 +11,7 @@ CFLAGS+=-I${SSHDIR} -include ssh_namespa SRCS+= roaming_dummy.c .endif -DPADD= ${LIBSSH} -LDADD= ${LDSSH} -USEPRIVATELIB= ssh +LIBADD= ssh .if ${MK_LDNS} != "no" CFLAGS+= -DHAVE_LDNS=1 @@ -22,8 +20,7 @@ CFLAGS+= -DHAVE_LDNS=1 #USEPRIVATELIB+= ldns .endif -DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD+= -lcrypt -lcrypto -lz +LIBADD+= crypt crypto z .include Modified: head/secure/usr.bin/ssh-agent/Makefile ============================================================================== --- head/secure/usr.bin/ssh-agent/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/secure/usr.bin/ssh-agent/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -11,9 +11,7 @@ CFLAGS+=-I${SSHDIR} -include ssh_namespa SRCS+= roaming_dummy.c .endif -DPADD= ${LIBSSH} -LDADD= ${LDSSH} -USEPRIVATELIB= ssh +LIBADD= ssh .if ${MK_LDNS} != "no" CFLAGS+= -DHAVE_LDNS=1 @@ -22,8 +20,7 @@ CFLAGS+= -DHAVE_LDNS=1 #USEPRIVATELIB+= ldns .endif -DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD+= -lcrypt -lcrypto -lz +LIBADD+= crypt crypto z .include Modified: head/secure/usr.bin/ssh-keygen/Makefile ============================================================================== --- head/secure/usr.bin/ssh-keygen/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/secure/usr.bin/ssh-keygen/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -11,19 +11,14 @@ CFLAGS+=-I${SSHDIR} -include ssh_namespa SRCS+= roaming_dummy.c .endif -DPADD= ${LIBSSH} -LDADD= ${LDSSH} -USEPRIVATELIB= ssh +LIBADD= ssh .if ${MK_LDNS} != "no" CFLAGS+= -DHAVE_LDNS=1 -DPADD+= ${LIBLDNS} -LDADD+= ${LDLDNS} -USEPRIVATELIB+= ldns +LIBADD+= ldns .endif -DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD+= -lcrypt -lcrypto -lz +LIBADD+= crypt crypto z .include Modified: head/secure/usr.bin/ssh-keyscan/Makefile ============================================================================== --- head/secure/usr.bin/ssh-keyscan/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/secure/usr.bin/ssh-keyscan/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -6,9 +6,7 @@ PROG= ssh-keyscan SRCS= ssh-keyscan.c roaming_dummy.c CFLAGS+=-I${SSHDIR} -include ssh_namespace.h -DPADD= ${LIBSSH} -LDADD= ${LDSSH} -USEPRIVATELIB= ssh +LIBADD= ssh .if ${MK_LDNS} != "no" CFLAGS+= -DHAVE_LDNS=1 @@ -17,8 +15,7 @@ CFLAGS+= -DHAVE_LDNS=1 #USEPRIVATELIB+= ldns .endif -DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD+= -lcrypt -lcrypto -lz +LIBADD+= crypt crypto z .include Modified: head/secure/usr.bin/ssh/Makefile ============================================================================== --- head/secure/usr.bin/ssh/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/secure/usr.bin/ssh/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -15,29 +15,23 @@ SRCS= ssh.c readconf.c clientloop.c ssht # gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile SRCS+= gss-genr.c -DPADD= ${LIBSSH} ${LIBUTIL} -LDADD= ${LDSSH} -lutil -USEPRIVATELIB= ssh +LIBADD= ssh util .if ${MK_LDNS} != "no" CFLAGS+= -DHAVE_LDNS=1 -DPADD+= ${LIBLDNS} -LDADD+= ${LDLDNS} -USEPRIVATELIB+= ldns +LIBADD+= ldns .endif .if ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -include krb5_config.h -DPADD+= ${LIBGSSAPI} -LDADD+= -lgssapi +LIBADD+= gssapi .endif .if ${MK_OPENSSH_NONE_CIPHER} != "no" CFLAGS+= -DNONE_CIPHER_ENABLED .endif -DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD+= -lcrypt -lcrypto -lz +LIBADD+= crypt crypto z .if defined(LOCALBASE) CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\" Modified: head/secure/usr.sbin/sshd/Makefile ============================================================================== --- head/secure/usr.sbin/sshd/Makefile Tue Nov 25 21:16:44 2014 (r275076) +++ head/secure/usr.sbin/sshd/Makefile Tue Nov 25 21:18:18 2014 (r275077) @@ -25,9 +25,7 @@ SRCS+= gss-genr.c MAN= sshd.8 sshd_config.5 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h -DPADD= ${LIBSSH} ${LIBUTIL} ${LIBWRAP} ${LIBPAM} -LDADD= ${LDSSH} -lutil -lwrap ${MINUSLPAM} -USEPRIVATELIB= ssh +LIBADD= ssh util wrap pam .if ${MK_LDNS} != "no" CFLAGS+= -DHAVE_LDNS=1 @@ -38,33 +36,29 @@ CFLAGS+= -DHAVE_LDNS=1 .if ${MK_AUDIT} != "no" CFLAGS+= -DUSE_BSM_AUDIT -DHAVE_GETAUDIT_ADDR -DPADD+= ${LIBBSM} -LDADD+= -lbsm +LIBADD+= bsm .endif .if ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -include krb5_config.h -DPADD+= ${LIBGSSAPI_KRB5} ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} \ - ${LIBCOM_ERR} ${LIBROKEN} ${LIBWIND} ${LIBHEIMBASE} ${LIBHEIMIPCC} -LDADD+= -lgssapi_krb5 -lgssapi -lkrb5 -lhx509 -lasn1 \ - -lcom_err -lroken -lwind -lheimbase ${LDHEIMIPCC} +LIBADD+= gssapi_krb5 gssapi krb5 hx509 asn1 com_err roken wind heimbase \ + heimipcc .endif .if ${MK_OPENSSH_NONE_CIPHER} != "no" CFLAGS+= -DNONE_CIPHER_ENABLED .endif -DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD+= -lcrypt -lcrypto -lz +LIBADD+= crypt crypto z # Fix the order of NEEDED entries for libthr and libc. The libthr # needs to interpose libc symbols, leaving the libthr loading as # dependency of krb causes reversed order and broken interposing. Put # the threading library last on the linker command line, just before # the -lc added by a compiler driver. +# XXX In theory the framework now takes care of that, it needs to be checked .if ${MK_KERBEROS_SUPPORT} != "no" -DPADD+= ${LIBPTHREAD} -LDADD+= -lpthread +LIBADD+= pthread .endif .if defined(LOCALBASE)