--- embedtools/src/Makefile.in	2013/01/18 13:18:14	1.4.2.1
+++ embedtools/src/Makefile.in	2014/02/08 20:57:16	1.6
@@ -3,7 +3,7 @@
 # by Michael Pounov <misho@openbsd-bg.org>
 #
 # $Author: misho $
-# $Id: Makefile.in,v 1.4.2.1 2013/01/18 13:18:14 misho Exp $
+# $Id: Makefile.in,v 1.6 2014/02/08 20:57:16 misho Exp $
 #
 
 prefix = @prefix@
@@ -12,6 +12,7 @@ includedir = @includedir@
 libdir = @libdir@
 
 OS = @OS@
+MACHINE = @host_cpu@
 
 CC = @CC@
 MKDEP = @MKDEP@
@@ -24,33 +25,43 @@ CFEXEC_LDADD = ${LDADD} -laitcfg
 DPATCH_LDADD = ${LDADD} -laitsync -lcrypto
 DIRER_LDADD = ${LDADD} -lcrypto -laitsync
 DIRCMP_LDADD = ${LDADD} -lcrypto -laitsync
-#XMLER_LDADD = ${LDADD} -laitio ${libdir}/libaxl.a ${libdir}/libaxl-ns.a
-XMLER_LDADD = ${LDADD} -laitwww -laxl -laxl-ns
+UBE_LDADD = ${LDADD} -laitcfg
+CFGER_LDADD = ${LDADD} -laitcfg
 WDOG_LDADD = 
 ATHCTL_LDADD = 
 DWDS_LDADD = ${LDADD} -laitcfg
 CFI_LDADD = 
 PCENG_LDADD = ${LDADD} -laitcfg
 VOUCHER_LDADD = ${LDADD} -lcrypto -laitcfg
+IMGUPD_LDADD = ${LDADD}
+BUTZ_LDADD = ${LDADD} -laitcfg -laitsched
 
-CFLAGS = -I. -I${INC} -I${includedir} -I${includedir}/axl @CFLAGS@
+CFLAGS = -I. -I${INC} -I${includedir} @CFLAGS@
 LDFLAGS = -L. -L${libdir} -Wl,-R${libdir} @LDFLAGS@
 
-SRCS = ${CFEXEC_SRCS} ${UPDIMG_SRCS} ${GET1STETH_SRCS} ${DPATCH_SRCS} \
-       ${DIRER_SRCS} ${DIRCMP_SRCS} ${XMLER_SRCS} ${WDOG_SRCS} \
-       ${PCENG_SRCS} ${VOUCHER_SRCS}
-PROG = ${CFEXEC_PROG} ${UPDIMG_PROG} ${GET1STETH_PROG} ${DPATCH_PROG} \
-       ${DIRER_PROG} ${DIRCMP_PROG} ${XMLER_PROG} ${WDOG_PROG} \
-       ${PCENG_PROG} ${VOUCHER_PROG}
+SRCS = ${CFEXEC_SRCS} ${GET1STETH_SRCS} ${DPATCH_SRCS} \
+       ${DIRER_SRCS} ${DIRCMP_SRCS} ${WDOG_SRCS} \
+       ${VOUCHER_SRCS} ${CFGER_SRCS} ${UBE_SRCS} \
+       ${IMGUPD_SRCS}
+PROG = ${CFEXEC_PROG} ${GET1STETH_PROG} ${DPATCH_PROG} \
+       ${DIRER_PROG} ${DIRCMP_PROG} ${WDOG_PROG} \
+       ${VOUCHER_PROG} ${CFGER_PROG} ${UBE_PROG} \
+       ${IMGUPD_PROG}
 
+.if ${MACHINE} == "i386" && ${OS} == "FreeBSD"
+SRCS += ${PCENG_SRCS}
+PROG += ${PCENG_PROG}
+.endif
+
+.if ${OS} == "FreeBSD"
+SRCS += ${BUTZ_SRCS}
+PROG += ${BUTZ_PROG}
+.endif
+
 CFEXEC_SRCS = cfexec.c
 CFEXEC_OBJS = cfexec.o compile.o
 CFEXEC_PROG = cfexec
 
-UPDIMG_SRCS = updimg.c upd.c
-UPDIMG_OBJS = updimg.o compile.o upd.o
-UPDIMG_PROG = updimg
-
 GET1STETH_SRCS = get1steth.c
 GET1STETH_OBJS = get1steth.o compile.o
 GET1STETH_PROG = get1steth
@@ -67,10 +78,14 @@ DIRCMP_SRCS = dircmp.c
 DIRCMP_OBJS = dircmp.o compile.o
 DIRCMP_PROG = dircmp
 
-XMLER_SRCS = xmler.c
-XMLER_OBJS = xmler.o compile.o
-XMLER_PROG = xmler
+CFGER_SRCS = cfger.c
+CFGER_OBJS = cfger.o compile.o
+CFGER_PROG = cfger
 
+UBE_SRCS = ube.c ub_env.c
+UBE_OBJS = ube.o compile.o ub_env.o
+UBE_PROG = ube
+
 WDOG_SRCS = wdog.c
 WDOG_OBJS = wdog.o compile.o
 WDOG_PROG = wdog
@@ -95,12 +110,20 @@ VOUCHER_SRCS = voucher.c
 VOUCHER_OBJS = voucher.o compile.o
 VOUCHER_PROG = voucher
 
+IMGUPD_SRCS = imgupd.c
+IMGUPD_OBJS = imgupd.o compile.o
+IMGUPD_PROG = imgupd
 
+BUTZ_SRCS = butz.c
+BUTZ_OBJS = butz.o compile.o
+BUTZ_PROG = butz
+
+
 all: depend \
 		${PROG} \
 		${OS}
 
-FreeBSD: ${ATHCTL_PROG} ${DWDS_PROG} ${CFI_PROG} ${PCENG_PROG}
+FreeBSD: ${ATHCTL_PROG} ${DWDS_PROG} ${CFI_PROG}
 
 OpenBSD:
 
@@ -121,9 +144,6 @@ install:
 ${CFEXEC_PROG}: ${CFEXEC_OBJS}
 	${CC} ${LDFLAGS} -o${BIN}/$@ ${CFEXEC_OBJS} ${CFEXEC_LDADD}
 
-${UPDIMG_PROG}: ${UPDIMG_OBJS}
-	${CC} ${LDFLAGS} -o${BIN}/$@ ${UPDIMG_OBJS}
-
 ${GET1STETH_PROG}: ${GET1STETH_OBJS}
 	${CC} ${LDFLAGS} -o${BIN}/$@ ${GET1STETH_OBJS}
 
@@ -136,9 +156,12 @@ ${DIRER_PROG}: ${DIRER_OBJS}
 ${DIRCMP_PROG}: ${DIRCMP_OBJS}
 	${CC} ${LDFLAGS} -o${BIN}/$@ ${DIRCMP_OBJS} ${LDADD} ${DIRCMP_LDADD}
 
-${XMLER_PROG}: ${XMLER_OBJS}
-	${CC} ${LDFLAGS} -o${BIN}/$@ ${XMLER_OBJS} ${XMLER_LDADD}
+${CFGER_PROG}: ${CFGER_OBJS}
+	${CC} ${LDFLAGS} -o${BIN}/$@ ${CFGER_OBJS} ${CFGER_LDADD}
 
+${UBE_PROG}: ${UBE_OBJS}
+	${CC} ${LDFLAGS} -o${BIN}/$@ ${UBE_OBJS} ${UBE_LDADD}
+
 ${WDOG_PROG}: ${WDOG_OBJS}
 	${CC} ${LDFLAGS} -o${BIN}/$@ ${WDOG_OBJS} ${WDOG_LDADD}
 
@@ -156,3 +179,9 @@ ${PCENG_PROG}: ${PCENG_OBJS}
 
 ${VOUCHER_PROG}: ${VOUCHER_OBJS}
 	${CC} ${LDFLAGS} -o${BIN}/$@ ${VOUCHER_OBJS} ${VOUCHER_LDADD}
+
+${IMGUPD_PROG}: ${IMGUPD_OBJS}
+	${CC} ${LDFLAGS} -o${BIN}/$@ ${IMGUPD_OBJS} ${IMGUPD_LDADD}
+
+${BUTZ_PROG}: ${BUTZ_OBJS}
+	${CC} ${LDFLAGS} -o${BIN}/$@ ${BUTZ_OBJS} ${BUTZ_LDADD}