--- embedtools/src/Makefile.in 2014/01/21 14:12:40 1.4.2.4 +++ embedtools/src/Makefile.in 2014/01/30 01:06:12 1.4.2.14 @@ -3,7 +3,7 @@ # by Michael Pounov # # $Author: misho $ -# $Id: Makefile.in,v 1.4.2.4 2014/01/21 14:12:40 misho Exp $ +# $Id: Makefile.in,v 1.4.2.14 2014/01/30 01:06:12 misho Exp $ # prefix = @prefix@ @@ -12,7 +12,7 @@ includedir = @includedir@ libdir = @libdir@ OS = @OS@ -MACHINE = @MACHINE@ +MACHINE = @host_cpu@ CC = @CC@ MKDEP = @MKDEP@ @@ -25,8 +25,8 @@ 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 @@ -34,15 +34,16 @@ CFI_LDADD = PCENG_LDADD = ${LDADD} -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} ${WDOG_SRCS} \ - ${VOUCHER_SRCS} + ${VOUCHER_SRCS} ${CFGER_SRCS} ${UBE_SRCS} PROG = ${CFEXEC_PROG} ${UPDIMG_PROG} ${GET1STETH_PROG} ${DPATCH_PROG} \ ${DIRER_PROG} ${DIRCMP_PROG} ${WDOG_PROG} \ - ${VOUCHER_PROG} + ${VOUCHER_PROG} ${CFGER_PROG} ${UBE_PROG} .if ${MACHINE} == "i386" && ${OS} == "FreeBSD" SRCS += ${PCENG_SRCS} @@ -73,10 +74,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 @@ -142,8 +147,11 @@ ${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}