Deleted Added
full compact
gendirdeps.mk (249033) gendirdeps.mk (250837)
1# $Id: gendirdeps.mk,v 1.21 2013/03/28 20:01:05 sjg Exp $
1# $Id: gendirdeps.mk,v 1.22 2013/05/11 05:16:26 sjg Exp $
2
3# Copyright (c) 2010-2013, Juniper Networks, Inc.
4# All rights reserved.
5#
6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions
8# are met:
9# 1. Redistributions of source code must retain the above copyright

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

106_time =
107_sh_x =
108_py_d =
109.endif
110
111.if ${META2DEPS:E} == "py"
112# we can afford to do this all the time.
113DPDEPS ?= no
2
3# Copyright (c) 2010-2013, Juniper Networks, Inc.
4# All rights reserved.
5#
6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions
8# are met:
9# 1. Redistributions of source code must retain the above copyright

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

106_time =
107_sh_x =
108_py_d =
109.endif
110
111.if ${META2DEPS:E} == "py"
112# we can afford to do this all the time.
113DPDEPS ?= no
114META2DEPS_CMD = ${_time} ${PYTHON} ${META2DEPS} ${_py_d} \
115 -R ${RELDIR} -H ${HOST_TARGET} \
116 ${M2D_OBJROOTS:O:u:@o@-O $o@}
117
114META2DEPS_CMD = ${_time} ${PYTHON} ${META2DEPS} ${_py_d}
118.if ${DPDEPS:tl} != "no"
119META2DEPS_CMD += -D ${DPDEPS}
120.endif
115.if ${DPDEPS:tl} != "no"
116META2DEPS_CMD += -D ${DPDEPS}
117.endif
118META2DEPS_FILTER = sed 's,^src:,${SRCTOP}/,;s,^\([^/]\),${OBJTOP}/\1,' |
119.elif ${META2DEPS:E} == "sh"
120META2DEPS_CMD = ${_time} ${_sh_x} ${META2DEPS} OBJTOP=${_OBJTOP}
121.else
122META2DEPS_CMD ?= ${META2DEPS}
123.endif
121
124
125.if ${TARGET_OBJ_SPEC:U${MACHINE}} != ${MACHINE}
126META2DEPS_CMD += -T ${TARGET_OBJ_SPEC}
127.endif
128META2DEPS_CMD += \
129 -R ${RELDIR} -H ${HOST_TARGET} \
130 ${M2D_OBJROOTS:O:u:@o@-O $o@}
131
132
122M2D_OBJROOTS += ${OBJTOP} ${_OBJROOT} ${_objroot}
123.if defined(SB_OBJROOT)
124M2D_OBJROOTS += ${SB_OBJROOT}
125.endif
126.if ${.MAKE.DEPENDFILE_PREFERENCE:U${.MAKE.DEPENDFILE}:M*.${MACHINE}} == ""
127# meta2deps.py only groks objroot
128# so we need to give it what it expects
129# and tell it not to add machine qualifiers
130META2DEPS_ARGS += MACHINE=none
131.endif
132.if defined(SB_BACKING_SB)
133META2DEPS_CMD += -S ${SB_BACKING_SB}/src
134M2D_OBJROOTS += ${SB_BACKING_SB}/${SB_OBJPREFIX}
135.endif
133M2D_OBJROOTS += ${OBJTOP} ${_OBJROOT} ${_objroot}
134.if defined(SB_OBJROOT)
135M2D_OBJROOTS += ${SB_OBJROOT}
136.endif
137.if ${.MAKE.DEPENDFILE_PREFERENCE:U${.MAKE.DEPENDFILE}:M*.${MACHINE}} == ""
138# meta2deps.py only groks objroot
139# so we need to give it what it expects
140# and tell it not to add machine qualifiers
141META2DEPS_ARGS += MACHINE=none
142.endif
143.if defined(SB_BACKING_SB)
144META2DEPS_CMD += -S ${SB_BACKING_SB}/src
145M2D_OBJROOTS += ${SB_BACKING_SB}/${SB_OBJPREFIX}
146.endif
136META2DEPS_FILTER = sed 's,^src:,${SRCTOP}/,;s,^\([^/]\),${OBJTOP}/\1,' |
137.elif ${META2DEPS:E} == "sh"
138META2DEPS_CMD = ${_time} ${_sh_x} ${META2DEPS} \
139 OBJTOP=${_objtop} SB_OBJROOT=${_objroot}
140.else
141META2DEPS_CMD ?= ${META2DEPS}
142.endif
143
144# we are only interested in the dirs
145# sepecifically those we read something from.
146# we canonicalize them to keep things simple
147# if we are using a split-fs sandbox, it gets a little messier.
148_objtop := ${_OBJTOP:tA}
149dir_list != cd ${_OBJDIR} && \
150 ${META2DEPS_CMD} MACHINE=${MACHINE} \

--- 178 unchanged lines hidden ---
147
148# we are only interested in the dirs
149# sepecifically those we read something from.
150# we canonicalize them to keep things simple
151# if we are using a split-fs sandbox, it gets a little messier.
152_objtop := ${_OBJTOP:tA}
153dir_list != cd ${_OBJDIR} && \
154 ${META2DEPS_CMD} MACHINE=${MACHINE} \

--- 178 unchanged lines hidden ---