--- embedtools/src/Makefile.in	2013/01/18 12:58:13	1.4
+++ embedtools/src/Makefile.in	2014/01/28 08:06:20	1.4.2.9
@@ -3,7 +3,7 @@
 # by Michael Pounov <misho@openbsd-bg.org>
 #
 # $Author: misho $
-# $Id: Makefile.in,v 1.4 2013/01/18 12:58:13 misho Exp $
+# $Id: Makefile.in,v 1.4.2.9 2014/01/28 08:06:20 misho Exp $
 #
 
 prefix = @prefix@
@@ -12,6 +12,7 @@ includedir = @includedir@
 libdir = @libdir@
 
 OS = @OS@
+MACHINE = @host_cpu@
 
 CC = @CC@
 MKDEP = @MKDEP@
@@ -19,30 +20,38 @@ MKDEP = @MKDEP@
 BIN = ../bin
 INC = ../inc
 
-LDADD = -laitcrc -laitio
+LDADD = -lelwix
 CFEXEC_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 -laitwww -laxl -laxl-ns
+#XMLER_LDADD = ${LDADD} -laitwww -laxl -laxl-ns
+UBE_LDADD = 
+CFGER_LDADD = ${LDADD} -laitcfg
 WDOG_LDADD = 
 ATHCTL_LDADD = 
-DWDS_LDADD = ${LDADD} -laitio -laitcfg
+DWDS_LDADD = ${LDADD} -laitcfg
 CFI_LDADD = 
 PCENG_LDADD = ${LDADD} -laitcfg
-VOUCHER_LDADD = ${LDADD} -lcrypto -laitio -laitcfg
+VOUCHER_LDADD = ${LDADD} -lcrypto -laitcfg
 
-CFLAGS = -I. -I${INC} -I${includedir} -I${includedir}/axl @CFLAGS@
+#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}
+       ${DIRER_SRCS} ${DIRCMP_SRCS} ${WDOG_SRCS} \
+       ${VOUCHER_SRCS} ${CFGER_SRCS}
 PROG = ${CFEXEC_PROG} ${UPDIMG_PROG} ${GET1STETH_PROG} ${DPATCH_PROG} \
-       ${DIRER_PROG} ${DIRCMP_PROG} ${XMLER_PROG} ${WDOG_PROG} \
-       ${PCENG_PROG} ${VOUCHER_PROG}
+       ${DIRER_PROG} ${DIRCMP_PROG} ${WDOG_PROG} \
+       ${VOUCHER_PROG} ${CFGER_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
@@ -67,10 +76,18 @@ DIRCMP_SRCS = dircmp.c
 DIRCMP_OBJS = dircmp.o compile.o
 DIRCMP_PROG = dircmp
 
+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_PROG = ube
+
 WDOG_SRCS = wdog.c
 WDOG_OBJS = wdog.o compile.o
 WDOG_PROG = wdog
@@ -100,7 +117,7 @@ all: depend \
 		${PROG} \
 		${OS}
 
-FreeBSD: ${ATHCTL_PROG} ${DWDS_PROG} ${CFI_PROG} ${PCENG_PROG}
+FreeBSD: ${ATHCTL_PROG} ${DWDS_PROG} ${CFI_PROG}
 
 OpenBSD:
 
@@ -136,8 +153,14 @@ ${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}
+
+#${XMLER_PROG}: ${XMLER_OBJS}
+#	${CC} ${LDFLAGS} -o${BIN}/$@ ${XMLER_OBJS} ${XMLER_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}