[BACK]Return to bsd.prog.mk CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / share / mk

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/share/mk/bsd.prog.mk between version 1.269.2.2 and 1.269.2.3

version 1.269.2.2, 2012/04/17 00:05:50 version 1.269.2.3, 2012/10/30 18:59:47
Line 310  _CCLINK= ${CXX} ${_CCLINKFLAGS}
Line 310  _CCLINK= ${CXX} ${_CCLINKFLAGS}
   
 .if defined(RUMPPRG)  .if defined(RUMPPRG)
 PROG=                   ${RUMPPRG}  PROG=                   ${RUMPPRG}
 .ifndef CRUNCHEDPROG  . ifndef CRUNCHEDPROG
   .  if (${MKRUMP} != "no")
 PROGS=                  ${RUMPPRG} rump.${RUMPPRG}  PROGS=                  ${RUMPPRG} rump.${RUMPPRG}
 . if defined(SRCS)  .  else
   PROGS=                  ${RUMPPRG}
   .  endif
   .  if defined(SRCS)
   .   if (${MKRUMP} != "no")
 SRCS.rump.${PROG}:=     ${SRCS} ${PROG}_rumpops.c ${RUMPSRCS}  SRCS.rump.${PROG}:=     ${SRCS} ${PROG}_rumpops.c ${RUMPSRCS}
   .   endif
 SRCS+=                  ${PROG}_hostops.c  SRCS+=                  ${PROG}_hostops.c
 . else  .  else
 SRCS=                   ${PROG}.c ${PROG}_hostops.c  SRCS=                   ${PROG}.c ${PROG}_hostops.c
   .   if (${MKRUMP} != "no")
 SRCS.rump.${PROG}=      ${PROG}.c ${PROG}_rumpops.c ${RUMPSRCS}  SRCS.rump.${PROG}=      ${PROG}.c ${PROG}_rumpops.c ${RUMPSRCS}
 . endif  .   endif
   .  endif
   .   if (${MKRUMP} != "no")
 DPSRCS+=                ${PROG}_rumpops.c ${RUMPSRCS}  DPSRCS+=                ${PROG}_rumpops.c ${RUMPSRCS}
 LDADD.rump.${PROG}+=    -lrumpclient  LDADD.rump.${PROG}+=    -lrumpclient
 DPADD.rump.${PROG}+=    ${LIBRUMPCLIENT}  DPADD.rump.${PROG}+=    ${LIBRUMPCLIENT}
 MAN.rump.${PROG}=       # defined but feeling empty  MAN.rump.${PROG}=       # defined but feeling empty
 _RUMPINSTALL.rump.${PROG}=# defined  _RUMPINSTALL.rump.${PROG}=# defined
 .else # CRUNCHEDPROG  .   endif
   . else # CRUNCHEDPROG
 PROGS=                  ${PROG}  PROGS=                  ${PROG}
 CPPFLAGS+=              -DCRUNCHOPS  CPPFLAGS+=              -DCRUNCHOPS
 .endif  . endif
 .endif  .endif
   
 .if defined(PROG)  .if defined(PROG)
Line 395  PAXCTL_FLAGS.${_P}?= ${PAXCTL_FLAGS}
Line 405  PAXCTL_FLAGS.${_P}?= ${PAXCTL_FLAGS}
   
 ##### PROG specific flags.  ##### PROG specific flags.
   
   _DPADD.${_P}=           ${DPADD}    ${DPADD.${_P}}
 _LDADD.${_P}=           ${LDADD}    ${LDADD.${_P}}  _LDADD.${_P}=           ${LDADD}    ${LDADD.${_P}}
 _LDFLAGS.${_P}=         ${LDFLAGS}  ${LDFLAGS.${_P}}  _LDFLAGS.${_P}=         ${LDFLAGS}  ${LDFLAGS.${_P}}
 _LDSTATIC.${_P}=        ${LDSTATIC} ${LDSTATIC.${_P}}  _LDSTATIC.${_P}=        ${LDSTATIC} ${LDSTATIC.${_P}}
Line 435  NODPSRCS+= ${f}
Line 446  NODPSRCS+= ${f}
 .endif  .endif
 .endfor  .endfor
   
 ${_P}: .gdbinit ${LIBCRT0} ${XOBJS.${_P}} ${SRCS.${_P}} ${DPSRCS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD}  ${_P}: .gdbinit ${LIBCRT0} ${XOBJS.${_P}} ${SRCS.${_P}} ${DPSRCS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${_DPADD.${_P}}
         ${_MKTARGET_LINK}          ${_MKTARGET_LINK}
 .if defined(DESTDIR)  .if defined(DESTDIR)
         ${_CCLINK.${_P}} -Wl,-nostdlib \          ${_CCLINK.${_P}} -Wl,-nostdlib \
Line 468  CLEANFILES+= ${_P}.d
Line 479  CLEANFILES+= ${_P}.d
   
 ${OBJS.${_P}} ${LOBJS.${_P}}: ${DPSRCS}  ${OBJS.${_P}} ${LOBJS.${_P}}: ${DPSRCS}
   
 ${_P}: .gdbinit ${LIBCRT0} ${OBJS.${_P}} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD}  ${_P}: .gdbinit ${LIBCRT0} ${OBJS.${_P}} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${_DPADD.${_P}}
 .if !commands(${_P})  .if !commands(${_P})
         ${_MKTARGET_LINK}          ${_MKTARGET_LINK}
         ${_CCLINK.${_P}} \          ${_CCLINK.${_P}} \
Line 487  ${_P}: .gdbinit ${LIBCRT0} ${OBJS.${_P}}
Line 498  ${_P}: .gdbinit ${LIBCRT0} ${OBJS.${_P}}
 .endif  # !commands(${_P})  .endif  # !commands(${_P})
 .endif  # USE_COMBINE  .endif  # USE_COMBINE
   
 ${_P}.ro: ${OBJS.${_P}} ${DPADD}  ${_P}.ro: ${OBJS.${_P}} ${_DPADD.${_P}}
         ${_MKTARGET_LINK}          ${_MKTARGET_LINK}
         ${CC} ${LDFLAGS} -nostdlib -r -Wl,-dc -o ${.TARGET} ${OBJS.${_P}}          ${CC} ${LDFLAGS} -nostdlib -r -Wl,-dc -o ${.TARGET} ${OBJS.${_P}}
   
Legend:
Removed from v.1.269.2.2  
changed lines
  Added in v.1.269.2.3
CVSweb <webmaster@jp.NetBSD.org>