Diff for /embedtools/src/Makefile.in between versions 1.4.2.2 and 1.4.2.6

version 1.4.2.2, 2013/05/22 11:57:33 version 1.4.2.6, 2014/01/21 16:26:09
Line 12  includedir = @includedir@ Line 12  includedir = @includedir@
 libdir = @libdir@  libdir = @libdir@
   
 OS = @OS@  OS = @OS@
MACHINE = @MACHINE@MACHINE = @HOST_CPU@
   
 CC = @CC@  CC = @CC@
 MKDEP = @MKDEP@  MKDEP = @MKDEP@
Line 26  DPATCH_LDADD = ${LDADD} -laitsync -lcrypto Line 26  DPATCH_LDADD = ${LDADD} -laitsync -lcrypto
 DIRER_LDADD = ${LDADD} -lcrypto -laitsync  DIRER_LDADD = ${LDADD} -lcrypto -laitsync
 DIRCMP_LDADD = ${LDADD} -lcrypto -laitsync  DIRCMP_LDADD = ${LDADD} -lcrypto -laitsync
 #XMLER_LDADD = ${LDADD} -laitio ${libdir}/libaxl.a ${libdir}/libaxl-ns.a  #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
 WDOG_LDADD =   WDOG_LDADD = 
 ATHCTL_LDADD =   ATHCTL_LDADD = 
 DWDS_LDADD = ${LDADD} -laitcfg  DWDS_LDADD = ${LDADD} -laitcfg
Line 34  CFI_LDADD =  Line 34  CFI_LDADD = 
 PCENG_LDADD = ${LDADD} -laitcfg  PCENG_LDADD = ${LDADD} -laitcfg
 VOUCHER_LDADD = ${LDADD} -lcrypto -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@  LDFLAGS = -L. -L${libdir} -Wl,-R${libdir} @LDFLAGS@
   
 SRCS = ${CFEXEC_SRCS} ${UPDIMG_SRCS} ${GET1STETH_SRCS} ${DPATCH_SRCS} \  SRCS = ${CFEXEC_SRCS} ${UPDIMG_SRCS} ${GET1STETH_SRCS} ${DPATCH_SRCS} \
       ${DIRER_SRCS} ${DIRCMP_SRCS} ${XMLER_SRCS} ${WDOG_SRCS} \       ${DIRER_SRCS} ${DIRCMP_SRCS} ${WDOG_SRCS} \
        ${VOUCHER_SRCS}         ${VOUCHER_SRCS}
 PROG = ${CFEXEC_PROG} ${UPDIMG_PROG} ${GET1STETH_PROG} ${DPATCH_PROG} \  PROG = ${CFEXEC_PROG} ${UPDIMG_PROG} ${GET1STETH_PROG} ${DPATCH_PROG} \
       ${DIRER_PROG} ${DIRCMP_PROG} ${XMLER_PROG} ${WDOG_PROG} \       ${DIRER_PROG} ${DIRCMP_PROG} ${WDOG_PROG} \
        ${VOUCHER_PROG}         ${VOUCHER_PROG}
   
.if ${MACHINE} == "i386".if ${MACHINE} == "i386" && ${OS} == "FreeBSD"
 SRCS += ${PCENG_SRCS}  SRCS += ${PCENG_SRCS}
 PROG += ${PCENG_PROG}  PROG += ${PCENG_PROG}
 .endif  .endif
Line 106  all: depend \ Line 107  all: depend \
                 ${PROG} \                  ${PROG} \
                 ${OS}                  ${OS}
   
FreeBSD: ${ATHCTL_PROG} ${DWDS_PROG} ${CFI_PROG} ${PCENG_PROG}FreeBSD: ${ATHCTL_PROG} ${DWDS_PROG} ${CFI_PROG}
   
 OpenBSD:  OpenBSD:
   
Line 142  ${DIRER_PROG}: ${DIRER_OBJS} Line 143  ${DIRER_PROG}: ${DIRER_OBJS}
 ${DIRCMP_PROG}: ${DIRCMP_OBJS}  ${DIRCMP_PROG}: ${DIRCMP_OBJS}
         ${CC} ${LDFLAGS} -o${BIN}/$@ ${DIRCMP_OBJS} ${LDADD} ${DIRCMP_LDADD}          ${CC} ${LDFLAGS} -o${BIN}/$@ ${DIRCMP_OBJS} ${LDADD} ${DIRCMP_LDADD}
   
${XMLER_PROG}: ${XMLER_OBJS}#${XMLER_PROG}: ${XMLER_OBJS}
        ${CC} ${LDFLAGS} -o${BIN}/$@ ${XMLER_OBJS} ${XMLER_LDADD}#        ${CC} ${LDFLAGS} -o${BIN}/$@ ${XMLER_OBJS} ${XMLER_LDADD}
   
 ${WDOG_PROG}: ${WDOG_OBJS}  ${WDOG_PROG}: ${WDOG_OBJS}
         ${CC} ${LDFLAGS} -o${BIN}/$@ ${WDOG_OBJS} ${WDOG_LDADD}          ${CC} ${LDFLAGS} -o${BIN}/$@ ${WDOG_OBJS} ${WDOG_LDADD}

Removed from v.1.4.2.2  
changed lines
  Added in v.1.4.2.6


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>