--- elwix/build_tools.sh	2014/01/20 00:04:35	1.6.6.6
+++ elwix/build_tools.sh	2014/01/21 16:33:40	1.6.6.7
@@ -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.6 2014/01/20 00:04:35 misho Exp $
+# $Id: build_tools.sh,v 1.6.6.7 2014/01/21 16:33:40 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -121,105 +121,67 @@ 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}
+	${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}
+	${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
@@ -234,13 +196,6 @@ compile_tools()
 
 	cd $CROSS_AITCFG
 	${AITCFG_CFG}
-	${CBUILD} clean
-	${CBUILD}
-	${CBUILD} install
-	cd -
-
-	cd $CROSS_AITSCHED
-	${AITSCHED_CFG}
 	${CBUILD} clean
 	${CBUILD}
 	${CBUILD} install