--- elwix/build_tools.sh	2014/01/15 09:09:44	1.6.6.3
+++ elwix/build_tools.sh	2014/09/11 22:55:36	1.6.6.10
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_tools.sh,v 1.6.6.3 2014/01/15 09:09:44 misho Exp $
+# $Id: build_tools.sh,v 1.6.6.10 2014/09/11 22:55:36 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -16,13 +16,13 @@ if [ X"${ELWIX_IS_CONFIGURED}" != X"YES" ]; then
 	exit 1
 fi
 V=${VERSION}
-[ -r ${CENV} ] && . ${CENV}
+#[ -r ${CENV} ] && . ${CENV}
 unset INSTALL
 unset VERSION
 VERSION="$V"
 
 # Set TARGET_CPUTYPE only for world compiling. Don't use this in kernel build!
-X_TARGET_CPUTYPE="${TARGET_CPUTYPE}"
+X_TARGET_CPUTYPE="TARGET_CPUTYPE=${TARGET_CPUTYPE}"
 
 if [ ! -d $BSDSRC ]; then
 	echo
@@ -121,105 +121,73 @@ compile_fbsdtools()
 	echo "+++ Compile ELWIX FreeBSD tools ..."
 
 	cd $CROSS_FT_VIMAGE
-	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean
-	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}
-	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install
+	${CBUILD} DESTDIR=${WORLD} clean
+	${CBUILD} DESTDIR=${WORLD}
+	${CBUILD} DESTDIR=${WORLD} install
 	cd -
 
 	cd $CROSS_FT_ATH
-	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean
-	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}
-	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install
+	${CBUILD} DESTDIR=${WORLD} clean
+	${CBUILD} DESTDIR=${WORLD} LIBBSDSTATDIR="${BSDOBJ}${BSDSRC}/lib/libbsdstat"
+	${CBUILD} DESTDIR=${WORLD} install
 	cd -
 
+	cd $CROSS_FT_NET80211/wlanstats
+	${CBUILD} DESTDIR=${WORLD} clean
+	${CBUILD} DESTDIR=${WORLD} LIBBSDSTATDIR="${BSDOBJ}${BSDSRC}/lib/libbsdstat"
+	${CBUILD} DESTDIR=${WORLD} install
+	cd -
+
 	cd $CROSS_FT_IPW
-	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean
-	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}
-	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}/usr/local/bin install
+	${CBUILD} DESTDIR=${WORLD} clean
+	${CBUILD} DESTDIR=${WORLD}
+	${CBUILD} DESTDIR=${WORLD}/usr/local/bin install
 	cd -
 
 	cd $CROSS_FT_IWI
-	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean
-	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}
-	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}/usr/local/bin install
+	${CBUILD} DESTDIR=${WORLD} clean
+	${CBUILD} DESTDIR=${WORLD}
+	${CBUILD} DESTDIR=${WORLD}/usr/local/bin install
 	cd -
 
 	cd $CROSS_FT_MWL
-	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean
-	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}
-	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install
+	${CBUILD} DESTDIR=${WORLD} clean
+	${CBUILD} DESTDIR=${WORLD} LIBBSDSTATDIR="${BSDOBJ}${BSDSRC}/lib/libbsdstat"
+	${CBUILD} DESTDIR=${WORLD} install
 	cd -
-
-#	cd $CROSS_FT_NET80211
-#	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-#		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean
-#	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-#		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}
-#	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-#		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install
-#	cd -
-
-#	cd $CROSS_FT_WTAP
-#	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-#		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean
-#	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-#		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}
-#	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-#		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install
-#	cd -
 }
 
 compile_files()
 {
 	cd files
-	env MAKEOBJDIRPREFIX=${BSDOBJ} make \
-		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \
-		__MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean
-	env MAKEOBJDIRPREFIX=${BSDOBJ} make \
-		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \
-		__MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} obj
-	env MAKEOBJDIRPREFIX=${BSDOBJ} make \
-		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \
-		__MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} depend 
-	env MAKEOBJDIRPREFIX=${BSDOBJ} make \
-		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \
-		__MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}
-	env MAKEOBJDIRPREFIX=${BSDOBJ} make \
-		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \
-		__MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install 
+	${CBUILD} DESTDIR=${WORLD} clean
+	${CBUILD} DESTDIR=${WORLD} obj
+	${CBUILD} DESTDIR=${WORLD} depend 
+	${CBUILD} DESTDIR=${WORLD}
+	${CBUILD} DESTDIR=${WORLD} install 
 	cd -
-
-	strip -s ${WORLD}/usr/bin/csh
 }
 
 compile_tools()
 {
 	echo "+++ Compile ELWIX Cross ..."
 
-	cd $CROSS_AXL
-	${AXL_CFG}
+#	cd $CROSS_AXL
+#	${AXL_CFG}
+#	${CBUILD} clean
+#	${CBUILD}
+#	${CBUILD} install
+#	cd -
+
+	cd $CROSS_ELWIX
+	${ELWIX_CFG}
 	${CBUILD} clean
 	${CBUILD}
 	${CBUILD} install
 	cd -
 
-	cd $CROSS_ELWIX
-	${ELWIX_CFG}
+	cd $CROSS_AITSCHED
+	${AITSCHED_CFG}
 	${CBUILD} clean
 	${CBUILD}
 	${CBUILD} install
@@ -239,13 +207,6 @@ compile_tools()
 	${CBUILD} install
 	cd -
 
-	cd $CROSS_AITSCHED
-	${AITSCHED_CFG}
-	${CBUILD} clean
-	${CBUILD}
-	${CBUILD} install
-	cd -
-
 	cd $CROSS_AITRPC
 	${AITRPC_CFG}
 	${CBUILD} clean
@@ -315,6 +276,13 @@ compile_tools()
 	${CBUILD}
 	${CBUILD} install
 	cd -
+
+	cd $CROSS_TFTPD
+	${TFTPD_CFG}
+	${CBUILD} clean
+	${CBUILD}
+	${CBUILD} install
+	cd -
 }
 
 install_tools()
@@ -351,22 +319,25 @@ build_tools()
 }
 
 ### main()
-if ! SnitVer ${WORLD}/elwix/elwix.ver; then
-	compile_deps || exit 1
+compile_deps || exit 1
+
+#if ! SnitVer ${WORLD}/elwix/elwix.ver; then
 #	clean_bootstrap
 #	compile_bootstrap || exit 1
+#
+#	echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >${WORLD}/elwix/elwix.ver
+#else
+#	echo "Skipped ELWIX bootstrap pkgsrc tools build ..."
+#fi
 
-	echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >${WORLD}/elwix/elwix.ver
-else
-	echo "Skipped ELWIX bootstrap pkgsrc tools build ..."
-fi
-
 if ! SnitVer ${WORLD}/usr/local/elwix.ver; then
-	clean_tools
-	compile_fbsdtools
-	compile_files
-	compile_tools
-	build_tools
+	clean_tools || exit 1
+
+	compile_fbsdtools || exit 1
+	compile_files || exit 1
+	compile_tools || exit 1
+
+	build_tools || exit 1
 
 	echo "ELWIX Platform:${PLATFORM} Version:${VERSION} TargetArch:${TARGET_ARCH}" >${WORLD}/usr/local/elwix.ver
 else