--- embedtools/src/Makefile.in	2014/01/28 08:06:20	1.4.2.9
+++ embedtools/src/Makefile.in	2014/02/05 10:09:05	1.4.2.18
@@ -3,7 +3,7 @@
 # by Michael Pounov <misho@openbsd-bg.org>
 #
 # $Author: misho $
-# $Id: Makefile.in,v 1.4.2.9 2014/01/28 08:06:20 misho Exp $
+# $Id: Makefile.in,v 1.4.2.18 2014/02/05 10:09:05 misho Exp $
 #
 
 prefix = @prefix@
@@ -25,9 +25,7 @@ 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 = 
+UBE_LDADD = ${LDADD} -laitcfg
 CFGER_LDADD = ${LDADD} -laitcfg
 WDOG_LDADD = 
 ATHCTL_LDADD = 
@@ -35,17 +33,17 @@ DWDS_LDADD = ${LDADD} -laitcfg
 CFI_LDADD = 
 PCENG_LDADD = ${LDADD} -laitcfg
 VOUCHER_LDADD = ${LDADD} -lcrypto -laitcfg
+IMGUPD_LDADD = ${LDADD}
 
-#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} \
+SRCS = ${CFEXEC_SRCS} ${GET1STETH_SRCS} ${DPATCH_SRCS} \
        ${DIRER_SRCS} ${DIRCMP_SRCS} ${WDOG_SRCS} \
-       ${VOUCHER_SRCS} ${CFGER_SRCS}
-PROG = ${CFEXEC_PROG} ${UPDIMG_PROG} ${GET1STETH_PROG} ${DPATCH_PROG} \
+       ${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}
+       ${VOUCHER_PROG} ${CFGER_PROG} ${UBE_PROG} ${IMGUPD_PROG}
 
 .if ${MACHINE} == "i386" && ${OS} == "FreeBSD"
 SRCS += ${PCENG_SRCS}
@@ -56,10 +54,6 @@ 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
@@ -80,12 +74,8 @@ CFGER_SRCS = cfger.c
 CFGER_OBJS = cfger.o compile.o
 CFGER_PROG = cfger
 
-XMLER_SRCS = xmler.c
-XMLER_OBJS = xmler.o compile.o
-XMLER_PROG = xmler
-
-UBE_SRCS = ube.c
-UBE_OBJS = ube.o compiler.o
+UBE_SRCS = ube.c ub_env.c
+UBE_OBJS = ube.o compile.o ub_env.o
 UBE_PROG = ube
 
 WDOG_SRCS = wdog.c
@@ -112,7 +102,11 @@ 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
 
+
 all: depend \
 		${PROG} \
 		${OS}
@@ -138,9 +132,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}
 
@@ -156,9 +147,6 @@ ${DIRCMP_PROG}: ${DIRCMP_OBJS}
 ${CFGER_PROG}: ${CFGER_OBJS}
 	${CC} ${LDFLAGS} -o${BIN}/$@ ${CFGER_OBJS} ${CFGER_LDADD}
 
-#${XMLER_PROG}: ${XMLER_OBJS}
-#	${CC} ${LDFLAGS} -o${BIN}/$@ ${XMLER_OBJS} ${XMLER_LDADD}
-
 ${UBE_PROG}: ${UBE_OBJS}
 	${CC} ${LDFLAGS} -o${BIN}/$@ ${UBE_OBJS} ${UBE_LDADD}
 
@@ -179,3 +167,6 @@ ${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}