--- embedtools/src/Makefile.in	2011/07/22 14:20:24	1.2.2.8
+++ 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.2.2.8 2011/07/22 14:20:24 misho Exp $
+# $Id: Makefile.in,v 1.4.2.18 2014/02/05 10:09:05 misho Exp $
 #
 
 prefix = @prefix@
@@ -12,6 +12,7 @@ includedir = @includedir@
 libdir = @libdir@
 
 OS = @OS@
+MACHINE = @host_cpu@
 
 CC = @CC@
 MKDEP = @MKDEP@
@@ -19,41 +20,40 @@ MKDEP = @MKDEP@
 BIN = ../bin
 INC = ../inc
 
-LDADD = -laitcrc
+LDADD = -lelwix
 CFEXEC_LDADD = ${LDADD} -laitcfg
-#DUMPCFG_LDADD = ${LDADD} -laitcfg
 DPATCH_LDADD = ${LDADD} -laitsync -lcrypto
-DIRER_LDADD = ${LDADD} -lcrypto -laitio -laitsync
+DIRER_LDADD = ${LDADD} -lcrypto -laitsync
 DIRCMP_LDADD = ${LDADD} -lcrypto -laitsync
-#XMLER_LDADD = ${LDADD} -laitio ${libdir}/libaxl.a ${libdir}/libaxl-ns.a
-XMLER_LDADD = ${LDADD} -laitio -laxl -laxl-ns
+UBE_LDADD = ${LDADD} -laitcfg
+CFGER_LDADD = ${LDADD} -laitcfg
 WDOG_LDADD = 
 ATHCTL_LDADD = 
-DWDS_LDADD = ${LDADD} -laitio -laitcfg
-PKGADM_LDADD =
+DWDS_LDADD = ${LDADD} -laitcfg
 CFI_LDADD = 
-PCENG_LDADD = -laitcfg
+PCENG_LDADD = ${LDADD} -laitcfg
+VOUCHER_LDADD = ${LDADD} -lcrypto -laitcfg
+IMGUPD_LDADD = ${LDADD}
 
-CFLAGS = -I. -I${INC} -I${includedir} -I${includedir}/axl -Wall -O2 -fPIC -g -DINET6
-LDFLAGS = -L. -L${libdir} -Wl,-R${libdir}
+CFLAGS = -I. -I${INC} -I${includedir} @CFLAGS@
+LDFLAGS = -L. -L${libdir} -Wl,-R${libdir} @LDFLAGS@
 
-SRCS = ${CFEXEC_SRCS} ${UPDIMG_SRCS} ${GET1STETH_SRCS} ${DPATCH_SRCS} ${RCD_SRCS} \
-       ${DIRER_SRCS} ${DIRCMP_SRCS} ${XMLER_SRCS} ${WDOG_SRCS} ${PKGADM_SRCS} ${PCENG_SRCS}
-PROG = ${CFEXEC_PROG} ${UPDIMG_PROG} ${GET1STETH_PROG} ${DPATCH_PROG} ${RCD_PROG} \
-       ${DIRER_PROG} ${DIRCMP_PROG} ${XMLER_PROG} ${WDOG_PROG} ${PKGADM_PROG} ${PCENG_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
+
 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
-
-#DUMPCFG_SRCS = dumpcfg.c dumpz.c
-#DUMPCFG_OBJS = dumpcfg.o compile.o dumpz.o
-#DUMPCFG_PROG = dumpcfg
-
 GET1STETH_SRCS = get1steth.c
 GET1STETH_OBJS = get1steth.o compile.o
 GET1STETH_PROG = get1steth
@@ -62,10 +62,6 @@ DPATCH_SRCS = dpatch.c
 DPATCH_OBJS = dpatch.o compile.o
 DPATCH_PROG = dpatch
 
-RCD_SRCS = rcd.c
-RCD_OBJS = rcd.o compile.o
-RCD_PROG = rcd
-
 DIRER_SRCS = direr.c
 DIRER_OBJS = direr.o compile.o
 DIRER_PROG = direr
@@ -74,10 +70,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
@@ -90,10 +90,6 @@ DWDS_SRCS = dwds.c vap.c
 DWDS_OBJS = dwds.o compile.o vap.o
 DWDS_PROG = dwds
 
-PKGADM_SRCS = pkgadm.c
-PKGADM_OBJS = pkgadm.o
-PKGADM_PROG = pkgadm
-
 CFI_SRCS = cfi.c
 CFI_OBJS = cfi.o compile.o
 CFI_PROG = cfi
@@ -102,12 +98,20 @@ PCENG_SRCS = pceng.c pceng_run.c
 PCENG_OBJS = pceng.o compile.o pceng_run.o
 PCENG_PROG = pceng
 
+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}
 
-FreeBSD: ${ATHCTL_PROG} ${DWDS_PROG} ${CFI_PROG} ${PCENG_PROG}
+FreeBSD: ${ATHCTL_PROG} ${DWDS_PROG} ${CFI_PROG}
 
 OpenBSD:
 
@@ -128,30 +132,24 @@ install:
 ${CFEXEC_PROG}: ${CFEXEC_OBJS}
 	${CC} ${LDFLAGS} -o${BIN}/$@ ${CFEXEC_OBJS} ${CFEXEC_LDADD}
 
-${UPDIMG_PROG}: ${UPDIMG_OBJS}
-	${CC} ${LDFLAGS} -o${BIN}/$@ ${UPDIMG_OBJS}
-
-#${DUMPCFG_PROG}: ${DUMPCFG_OBJS}
-#	${CC} ${LDFLAGS} -o${BIN}/$@ ${DUMPCFG_OBJS} ${DUMPCFG_LDADD}
-
 ${GET1STETH_PROG}: ${GET1STETH_OBJS}
 	${CC} ${LDFLAGS} -o${BIN}/$@ ${GET1STETH_OBJS}
 
 ${DPATCH_PROG}: ${DPATCH_OBJS}
 	${CC} ${LDFLAGS} -o${BIN}/$@ ${DPATCH_OBJS} ${DPATCH_LDADD}
 
-${RCD_PROG}: ${RCD_OBJS}
-	${CC} ${LDFLAGS} -o${BIN}/$@ ${RCD_OBJS} ${LDADD}
-
 ${DIRER_PROG}: ${DIRER_OBJS}
 	${CC} ${LDFLAGS} -o${BIN}/$@ ${DIRER_OBJS} ${LDADD} ${DIRER_LDADD}
 
 ${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}
 
@@ -161,11 +159,14 @@ ${ATHCTL_PROG}: ${ATHCTL_OBJS}
 ${DWDS_PROG}: ${DWDS_OBJS}
 	${CC} ${LDFLAGS} -o${BIN}/$@ ${DWDS_OBJS} ${DWDS_LDADD}
 
-${PKGADM_PROG}: ${PKGADM_OBJS}
-	${CC} ${LDFLAGS} -o${BIN}/$@ ${PKGADM_OBJS} ${PKGADM_LDADD}
-
 ${CFI_PROG}: ${CFI_OBJS}
 	${CC} ${LDFLAGS} -o${BIN}/$@ ${CFI_OBJS} ${CFI_LDADD}
 
 ${PCENG_PROG}: ${PCENG_OBJS}
 	${CC} ${LDFLAGS} -o${BIN}/$@ ${PCENG_OBJS} ${PCENG_LDADD}
+
+${VOUCHER_PROG}: ${VOUCHER_OBJS}
+	${CC} ${LDFLAGS} -o${BIN}/$@ ${VOUCHER_OBJS} ${VOUCHER_LDADD}
+
+${IMGUPD_PROG}: ${IMGUPD_OBJS}
+	${CC} ${LDFLAGS} -o${BIN}/$@ ${IMGUPD_OBJS} ${IMGUPD_LDADD}