--- embedtools/src/Makefile.in 2013/05/22 11:57:33 1.4.2.2 +++ embedtools/src/Makefile.in 2014/01/24 15:26:39 1.4.2.8 @@ -3,7 +3,7 @@ # by Michael Pounov # # $Author: misho $ -# $Id: Makefile.in,v 1.4.2.2 2013/05/22 11:57:33 misho Exp $ +# $Id: Makefile.in,v 1.4.2.8 2014/01/24 15:26:39 misho Exp $ # prefix = @prefix@ @@ -12,7 +12,7 @@ includedir = @includedir@ libdir = @libdir@ OS = @OS@ -MACHINE = @MACHINE@ +MACHINE = @host_cpu@ CC = @CC@ MKDEP = @MKDEP@ @@ -26,7 +26,8 @@ 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 +#XMLER_LDADD = ${LDADD} -laitwww -laxl -laxl-ns +CFGER_LDADD = ${LDADD} -laitcfg WDOG_LDADD = ATHCTL_LDADD = DWDS_LDADD = ${LDADD} -laitcfg @@ -34,17 +35,18 @@ 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} ${XMLER_SRCS} ${WDOG_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} \ - ${VOUCHER_PROG} + ${DIRER_PROG} ${DIRCMP_PROG} ${WDOG_PROG} \ + ${VOUCHER_PROG} ${CFGER_PROG} -.if ${MACHINE} == "i386" +.if ${MACHINE} == "i386" && ${OS} == "FreeBSD" SRCS += ${PCENG_SRCS} PROG += ${PCENG_PROG} .endif @@ -73,6 +75,10 @@ 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 @@ -106,7 +112,7 @@ all: depend \ ${PROG} \ ${OS} -FreeBSD: ${ATHCTL_PROG} ${DWDS_PROG} ${CFI_PROG} ${PCENG_PROG} +FreeBSD: ${ATHCTL_PROG} ${DWDS_PROG} ${CFI_PROG} OpenBSD: @@ -142,8 +148,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} + +#${XMLER_PROG}: ${XMLER_OBJS} +# ${CC} ${LDFLAGS} -o${BIN}/$@ ${XMLER_OBJS} ${XMLER_LDADD} ${WDOG_PROG}: ${WDOG_OBJS} ${CC} ${LDFLAGS} -o${BIN}/$@ ${WDOG_OBJS} ${WDOG_LDADD}