Diff for /embedtools/src/Makefile.in between versions 1.4 and 1.4.2.5

version 1.4, 2013/01/18 12:58:13 version 1.4.2.5, 2014/01/21 15:35:20
Line 12  includedir = @includedir@ Line 12  includedir = @includedir@
 libdir = @libdir@  libdir = @libdir@
   
 OS = @OS@  OS = @OS@
   MACHINE = @MACHINE@
   
 CC = @CC@  CC = @CC@
 MKDEP = @MKDEP@  MKDEP = @MKDEP@
Line 19  MKDEP = @MKDEP@ Line 20  MKDEP = @MKDEP@
 BIN = ../bin  BIN = ../bin
 INC = ../inc  INC = ../inc
   
LDADD = -laitcrc -laitioLDADD = -lelwix
 CFEXEC_LDADD = ${LDADD} -laitcfg  CFEXEC_LDADD = ${LDADD} -laitcfg
 DPATCH_LDADD = ${LDADD} -laitsync -lcrypto  DPATCH_LDADD = ${LDADD} -laitsync -lcrypto
DIRER_LDADD = ${LDADD} -lcrypto -laitio -laitsyncDIRER_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} -laitio -laitwww -laxl -laxl-ns#XMLER_LDADD = ${LDADD} -laitwww -laxl -laxl-ns
 WDOG_LDADD =   WDOG_LDADD = 
 ATHCTL_LDADD =   ATHCTL_LDADD = 
DWDS_LDADD = ${LDADD} -laitio -laitcfgDWDS_LDADD = ${LDADD} -laitcfg
 CFI_LDADD =   CFI_LDADD = 
 PCENG_LDADD = ${LDADD} -laitcfg  PCENG_LDADD = ${LDADD} -laitcfg
VOUCHER_LDADD = ${LDADD} -lcrypto -laitio -laitcfgVOUCHER_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} \
       ${PCENG_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} \
       ${PCENG_PROG} ${VOUCHER_PROG}       ${VOUCHER_PROG}
   
   .if ${MACHINE} == "i386" && ${OS} == "FreeBSD"
   SRCS += ${PCENG_SRCS}
   PROG += ${PCENG_PROG}
   .endif
   
 CFEXEC_SRCS = cfexec.c  CFEXEC_SRCS = cfexec.c
 CFEXEC_OBJS = cfexec.o compile.o  CFEXEC_OBJS = cfexec.o compile.o
 CFEXEC_PROG = cfexec  CFEXEC_PROG = cfexec
Line 100  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 136  ${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  
changed lines
  Added in v.1.4.2.5


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