Deleted Added
full compact
dpadd.mk (246223) dpadd.mk (268437)
1# $Id: dpadd.mk,v 1.18 2011/11/10 05:13:37 sjg Exp $
1# $Id: dpadd.mk,v 1.19 2014/04/05 22:56:54 sjg Exp $
2#
3# @(#) Copyright (c) 2004, Simon J. Gerraty
4#
5# This file is provided in the hope that it will
6# be of use. There is absolutely NO WARRANTY.
7# Permission to copy, redistribute or otherwise
8# use this file is hereby granted provided that
9# the above copyright notice and this notice are

--- 53 unchanged lines hidden (view full) ---

63.if defined(USE_DMALLOC) && ${USE_DMALLOC} != no
64.if !defined(NO_DMALLOC)
65CPPFLAGS+= -DUSE_DMALLOC
66.endif
67DPLIBS+= ${LIBDMALLOC}
68.endif
69.endif
70
2#
3# @(#) Copyright (c) 2004, Simon J. Gerraty
4#
5# This file is provided in the hope that it will
6# be of use. There is absolutely NO WARRANTY.
7# Permission to copy, redistribute or otherwise
8# use this file is hereby granted provided that
9# the above copyright notice and this notice are

--- 53 unchanged lines hidden (view full) ---

63.if defined(USE_DMALLOC) && ${USE_DMALLOC} != no
64.if !defined(NO_DMALLOC)
65CPPFLAGS+= -DUSE_DMALLOC
66.endif
67DPLIBS+= ${LIBDMALLOC}
68.endif
69.endif
70
71# Order -L's to seach ours first.
71# Order -L's to search ours first.
72# Avoids picking up old versions already installed.
73__dpadd_libdirs := ${__dpadd_libs:R:H:S/^/-L/g:O:u:N-L}
74LDADD += ${__dpadd_libdirs:M-L${OBJTOP}/*}
75LDADD += ${__dpadd_libdirs:N-L${OBJTOP}/*}
76
77.if ${.CURDIR} == ${SRCTOP}
78RELDIR=.
79RELTOP=.

--- 14 unchanged lines hidden (view full) ---

94SRC_LIBS+= ${_OBJDIR}/lib${LIB}.a
95.endif
96.endif
97
98#
99# This little bit of magic, assumes that SRC_libfoo will be
100# set if it cannot be correctly derrived from ${LIBFOO}
101# Note that SRC_libfoo and INCLUDES_libfoo should be named for the
72# Avoids picking up old versions already installed.
73__dpadd_libdirs := ${__dpadd_libs:R:H:S/^/-L/g:O:u:N-L}
74LDADD += ${__dpadd_libdirs:M-L${OBJTOP}/*}
75LDADD += ${__dpadd_libdirs:N-L${OBJTOP}/*}
76
77.if ${.CURDIR} == ${SRCTOP}
78RELDIR=.
79RELTOP=.

--- 14 unchanged lines hidden (view full) ---

94SRC_LIBS+= ${_OBJDIR}/lib${LIB}.a
95.endif
96.endif
97
98#
99# This little bit of magic, assumes that SRC_libfoo will be
100# set if it cannot be correctly derrived from ${LIBFOO}
101# Note that SRC_libfoo and INCLUDES_libfoo should be named for the
102# actual libary name not the variable name that might refer to it.
102# actual library name not the variable name that might refer to it.
103# 99% of the time the two are the same, but the DPADD logic
103# 99% of the time the two are the same, but the DPADD logic
104# only has the libary name available, so stick to that.
104# only has the library name available, so stick to that.
105#
106
107SRC_LIBS?=
108__dpadd_libs += ${SRC_LIBS}
109DPMAGIC_LIBS += ${__dpadd_libs} \
110 ${__dpadd_libs:@d@${DPMAGIC_LIBS_${d:T:R}}@}
111
112.for __lib in ${DPMAGIC_LIBS:O:u}

--- 84 unchanged lines hidden ---
105#
106
107SRC_LIBS?=
108__dpadd_libs += ${SRC_LIBS}
109DPMAGIC_LIBS += ${__dpadd_libs} \
110 ${__dpadd_libs:@d@${DPMAGIC_LIBS_${d:T:R}}@}
111
112.for __lib in ${DPMAGIC_LIBS:O:u}

--- 84 unchanged lines hidden ---