PERFORCE change 104997 for review
Warner Losh
imp at FreeBSD.org
Thu Aug 24 23:15:43 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=104997
Change 104997 by imp at imp_bugs on 2006/08/24 23:15:23
Cleanup
Affected files ...
.. //depot/projects/arm/src/Makefile#4 edit
.. //depot/projects/arm/src/Makefile.inc1#8 edit
Differences ...
==== //depot/projects/arm/src/Makefile#4 (text+ko) ====
@@ -79,13 +79,15 @@
obj objlink regress rerelease showconfig tags toolchain update \
_worldtmp _legacy _bootstrap-tools _cleanobj _obj \
_build-tools _cross-tools _includes _libraries _depend \
- build32 distribute32 install32 cross-build cross-devel cross-devel-install
+ build32 distribute32 install32
TGTS+= ${SUBDIR_TARGETS}
BITGTS= files includes
BITGTS:=${BITGTS} ${BITGTS:S/^/build/} ${BITGTS:S/^/install/}
TGTS+= ${BITGTS}
+TGTS+= xdev xdev-build xdev-install
+
.ORDER: buildworld installworld
.ORDER: buildworld distributeworld
.ORDER: buildworld buildkernel
==== //depot/projects/arm/src/Makefile.inc1#8 (text+ko) ====
@@ -1203,6 +1203,7 @@
###############
+
.if defined(XDEV) && defined(XDEV_ARCH)
NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \
@@ -1224,14 +1225,17 @@
CD2MAKE=${CDENV} PATH=${CDTMP}/usr/bin:${XDTP}/usr/bin:${PATH} ${MAKE} ${NOFUN}
XDDESTDIR=${DESTDIR}${XDTP}
-.ORDER: cross-build cross-devel cross-devel-install
-xdev: cross-build cross-devel cross-devel-install
+.ORDER: xdev-build xdev-install
+xdev: xdev-build xdev-install
+
+.ORDER: _xb-build-tools _xb-cross-tools
+xdev-build: _xb-build-tools _xb-cross-tools
-cross-build:
+_xb-build-tools:
${_+_}cd ${.CURDIR}; \
${CDBENV} ${MAKE} -f Makefile.inc1 build-tools
-cross-devel:
+_xb-cross-tools:
.for _tool in \
gnu/usr.bin/binutils \
gnu/usr.bin/cc
@@ -1244,7 +1248,7 @@
${_+_}cd ${.CURDIR}; ${TMAKE} build-tools
-_cdi-mtree:
+_xi-mtree:
${_+_}@${ECHODIR} "mtree populating ${XDDESTDIR}"
mkdir -p ${XDDESTDIR}
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.root.dist \
@@ -1253,8 +1257,11 @@
-p ${XDDESTDIR}/usr >/dev/null
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
-p ${XDDESTDIR}/usr/include >/dev/null
-
-cross-devel-install: _cdi-mtree
+
+.ORDER: _xi-mtree _xi-cross-tools _xi-includes _xi-libraries _xi-links
+xdev-install: _xi-mtree _xi-cross-tools _xi-includes _xi-libraries _xi-links
+
+_xi-cross-tools:
.for _tool in \
gnu/usr.bin/binutils \
gnu/usr.bin/cc
@@ -1262,7 +1269,17 @@
cd ${.CURDIR}/${_tool}; \
${CDMAKE} DIRPRFX=${_tool}/ install DESTDIR=${XDDESTDIR}
.endfor
- ${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 par-includes DESTDIR=${XDDESTDIR}
- ${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 libraries DESTDIR=${XDDESTDIR}
+
+_xi-includes:
+ ${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 par-includes \
+ DESTDIR=${XDDESTDIR}
+
+_xi-libraries:
+ ${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 libraries \
+ DESTDIR=${XDDESTDIR}
+_xi-links:
+ ${_+_}cd ${XDDESTDIR}/usr/bin; \
+ for i in *; do \
+ ln -s ../../${XDTP}/$$i ../../../../usr/bin/${XDDIR}-$$i; done
.endif
More information about the p4-projects
mailing list