--- embedtools/src/Makefile.in	2011/06/08 12:45:41	1.2
+++ embedtools/src/Makefile.in	2012/07/04 13:49:02	1.2.2.11
@@ -3,7 +3,7 @@
 # by Michael Pounov <misho@openbsd-bg.org>
 #
 # $Author: misho $
-# $Id: Makefile.in,v 1.2 2011/06/08 12:45:41 misho Exp $
+# $Id: Makefile.in,v 1.2.2.11 2012/07/04 13:49:02 misho Exp $
 #
 
 prefix = @prefix@
@@ -11,6 +11,8 @@ exec_prefix = @exec_prefix@
 includedir = @includedir@
 libdir = @libdir@
 
+OS = @OS@
+
 CC = @CC@
 MKDEP = @MKDEP@
 
@@ -24,23 +26,24 @@ DPATCH_LDADD = ${LDADD} -laitsync -lcrypto
 DIRER_LDADD = ${LDADD} -lcrypto -laitio -laitsync
 DIRCMP_LDADD = ${LDADD} -lcrypto -laitsync
 #XMLER_LDADD = ${LDADD} -laitio ${libdir}/libaxl.a ${libdir}/libaxl-ns.a
-XMLER_LDADD = ${LDADD} -laitio -laxl -laxl-ns
+XMLER_LDADD = ${LDADD} -laitio -laitwww -laxl -laxl-ns
 WDOG_LDADD = 
-CLOG_LDADD = 
 ATHCTL_LDADD = 
 DWDS_LDADD = ${LDADD} -laitio -laitcfg
-SYSLOGD_LDADD = -lutil
 PKGADM_LDADD =
+CFI_LDADD = 
+PCENG_LDADD = -laitcfg
+VOUCHER_LDADD =
 
 CFLAGS = -I. -I${INC} -I${includedir} -I${includedir}/axl -Wall -O2 -fPIC -g -DINET6
-LDFLAGS = -L. -L${libdir}
+LDFLAGS = -L. -L${libdir} -Wl,-R${libdir}
 
 SRCS = ${CFEXEC_SRCS} ${UPDIMG_SRCS} ${GET1STETH_SRCS} ${DPATCH_SRCS} ${RCD_SRCS} \
-       ${DIRER_SRCS} ${DIRCMP_SRCS} ${XMLER_SRCS} ${CLOG_SRCS} ${SYSLOGD_SRCS} \
-       ${WDOG_SRCS} ${ATHCTL_SRCS} ${DWDS_SRCS} ${PKGADM_SRCS}
+       ${DIRER_SRCS} ${DIRCMP_SRCS} ${XMLER_SRCS} ${WDOG_SRCS} ${PKGADM_SRCS} \
+       ${PCENG_SRCS} ${VOUCHER_SRCS}
 PROG = ${CFEXEC_PROG} ${UPDIMG_PROG} ${GET1STETH_PROG} ${DPATCH_PROG} ${RCD_PROG} \
-       ${DIRER_PROG} ${DIRCMP_PROG} ${XMLER_PROG} ${CLOG_PROG} ${SYSLOGD_PROG} \
-       ${WDOG_PROG} ${ATHCTL_PROG} ${DWDS_PROG} ${PKGADM_PROG}
+       ${DIRER_PROG} ${DIRCMP_PROG} ${XMLER_PROG} ${WDOG_PROG} ${PKGADM_PROG} \
+       ${PCENG_PROG} ${VOUCHER_PROG}
 
 CFEXEC_SRCS = cfexec.c
 CFEXEC_OBJS = cfexec.o compile.o
@@ -78,14 +81,6 @@ XMLER_SRCS = xmler.c
 XMLER_OBJS = xmler.o compile.o
 XMLER_PROG = xmler
 
-CLOG_SRCS = clog.c
-CLOG_OBJS = clog.o compile.o
-CLOG_PROG = clog
-
-SYSLOGD_SRCS = syslogd.c
-SYSLOGD_OBJS = syslogd.o compile.o
-SYSLOGD_PROG = syslogd
-
 WDOG_SRCS = wdog.c
 WDOG_OBJS = wdog.o compile.o
 WDOG_PROG = wdog
@@ -102,10 +97,29 @@ PKGADM_SRCS = pkgadm.c
 PKGADM_OBJS = pkgadm.o
 PKGADM_PROG = pkgadm
 
+CFI_SRCS = cfi.c
+CFI_OBJS = cfi.o compile.o
+CFI_PROG = cfi
 
+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
+VOUCHER_PROG = voucher
+
+
 all: depend \
-		${PROG}
+		${PROG} \
+		${OS}
 
+FreeBSD: ${ATHCTL_PROG} ${DWDS_PROG} ${CFI_PROG} ${PCENG_PROG}
+
+OpenBSD:
+
+NetBSD:
+
 .c.o: ${SRCS} compile.c
 	${CC} -c ${CFLAGS} $<
 
@@ -145,12 +159,6 @@ ${DIRCMP_PROG}: ${DIRCMP_OBJS}
 ${XMLER_PROG}: ${XMLER_OBJS}
 	${CC} ${LDFLAGS} -o${BIN}/$@ ${XMLER_OBJS} ${XMLER_LDADD}
 
-${CLOG_PROG}: ${CLOG_OBJS}
-	${CC} ${LDFLAGS} -o${BIN}/$@ ${CLOG_OBJS} ${CLOG_LDADD}
-
-${SYSLOGD_PROG}: ${SYSLOGD_OBJS}
-	${CC} ${LDFLAGS} -o${BIN}/$@ ${SYSLOGD_OBJS} ${SYSLOGD_LDADD}
-
 ${WDOG_PROG}: ${WDOG_OBJS}
 	${CC} ${LDFLAGS} -o${BIN}/$@ ${WDOG_OBJS} ${WDOG_LDADD}
 
@@ -162,3 +170,12 @@ ${DWDS_PROG}: ${DWDS_OBJS}
 
 ${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}