[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.189 and 1.200

version 1.189, 2003/09/29 01:06:37 version 1.200, 2004/06/10 00:29:59
Line 12  PROG= ${PROG_CXX}
Line 12  PROG= ${PROG_CXX}
 .endif  .endif
   
 ##### Basic targets  ##### Basic targets
 .PHONY:         cleanextra cleanobjs cleanprog proginstall scriptsinstall  
 realinstall:    proginstall scriptsinstall  realinstall:    proginstall scriptsinstall
 clean:          cleanprog  clean:          cleanprog
   
Line 28  LDSTATIC+=  ${LDSTATIC.${PROG}}
Line 27  LDSTATIC+=  ${LDSTATIC.${PROG}}
 CPPFLAGS+=      ${DESTDIR:D-nostdinc ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include}  CPPFLAGS+=      ${DESTDIR:D-nostdinc ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include}
 CXXFLAGS+=      ${DESTDIR:D-nostdinc++ ${CPPFLAG_ISYSTEMXX} ${DESTDIR}/usr/include/g++}  CXXFLAGS+=      ${DESTDIR:D-nostdinc++ ${CPPFLAG_ISYSTEMXX} ${DESTDIR}/usr/include/g++}
 CFLAGS+=        ${COPTS}  CFLAGS+=        ${COPTS}
   MKDEP_SUFFIXES?=        .o .ln
   
 # ELF platforms depend on crti.o, crtbegin.o, crtend.o, and crtn.o  # ELF platforms depend on crti.o, crtbegin.o, crtend.o, and crtn.o
 .if ${OBJECT_FMT} == "ELF"  .if ${OBJECT_FMT} == "ELF"
Line 59  __bsd_prog_mk_system_libs?= \
Line 59  __bsd_prog_mk_system_libs?= \
         BZ2 C C_PIC CDK COM_ERR COMPAT CRYPT CRYPTO CRYPTO_IDEA CRYPTO_MDC2 \          BZ2 C C_PIC CDK COM_ERR COMPAT CRYPT CRYPTO CRYPTO_IDEA CRYPTO_MDC2 \
         CRYPTO_RC5 \          CRYPTO_RC5 \
         CURSES DBM DES EDIT EVENT FORM GCC GNUMALLOC GSSAPI HDB INTL IPSEC \          CURSES DBM DES EDIT EVENT FORM GCC GNUMALLOC GSSAPI HDB INTL IPSEC \
         KADM KADM5CLNT KADM5SRV KAFS KDB KRB KRB5 KSTREAM KVM L M MENU \          KADM KADM5CLNT KADM5SRV KAFS KDB KRB KRB5 KSTREAM KVM L M MAGIC MENU \
         OBJC OSSAUDIO PCAP PCI PMC POSIX PTHREAD PTHREAD_DBG RESOLV RMT \          OBJC OSSAUDIO PCAP PCI PMC POSIX PTHREAD PTHREAD_DBG RESOLV RMT \
         ROKEN RPCSVC RT SKEY SL SS SSL TERMCAP USBHID UTIL WRAP Y Z          ROKEN RPCSVC RT SKEY SL SS SSL TERMCAP USBHID UTIL WRAP Y Z
   
Line 118  SRCS?=  ${PROG}.cc
Line 118  SRCS?=  ${PROG}.cc
 SRCS?=          ${PROG}.c  SRCS?=          ${PROG}.c
 .endif  .endif
   
 DPSRCS+=        ${SRCS:M*.l:.l=.c} ${SRCS:M*.y:.y=.c}  _YPSRCS=        ${SRCS:M*.[ly]:C/\..$/.c/} ${YHEADER:D${SRCS:M*.y:.y=.h}}
 DPSRCS+=        ${YHEADER:D${SRCS:M*.y:.y=.h}}  
 CLEANFILES+=    ${SRCS:M*.l:.l=.c} ${SRCS:M*.y:.y=.c}  DPSRCS+=        ${_YPSRCS}
 CLEANFILES+=    ${YHEADER:D${SRCS:M*.y:.y=.h}}  CLEANFILES+=    ${_YPSRCS}
   
 .if !empty(SRCS:N*.h:N*.sh:N*.fth)  .if !empty(SRCS:N*.h:N*.sh:N*.fth)
 OBJS+=          ${SRCS:N*.h:N*.sh:N*.fth:R:S/$/.o/g}  OBJS+=          ${SRCS:N*.h:N*.sh:N*.fth:R:S/$/.o/g}
Line 129  LOBJS+=  ${LSRCS:.c=.ln} ${SRCS:M*.c:.c=
Line 129  LOBJS+=  ${LSRCS:.c=.ln} ${SRCS:M*.c:.c=
 .endif  .endif
   
 .if defined(OBJS) && !empty(OBJS)  .if defined(OBJS) && !empty(OBJS)
 .NOPATH: ${OBJS} ${PROG} ${SRCS:M*.[ly]:C/\..$/.c/} ${YHEADER:D${SRCS:M*.y:.y=.h}}  .NOPATH: ${OBJS} ${PROG} ${_YPSRCS}
   
 _PROGLDOPTS=  _PROGLDOPTS=
 .if ${SHLINKDIR} != "/usr/libexec"      # XXX: change or remove if ld.so moves  .if ${SHLINKDIR} != "/usr/libexec"      # XXX: change or remove if ld.so moves
 .if ${OBJECT_FMT} == "ELF"  .if ${OBJECT_FMT} == "ELF"
 _PROGLDOPTS+=   -Wl,-dynamic-linker=${_SHLINKER}  _PROGLDOPTS+=   -Wl,-dynamic-linker=${_SHLINKER}
 .endif  .endif
 .if ${OBJECT_FMT} == "a.out"  
 LIBCRT0=        ${DESTDIR}/lib/crt0.o  
 .endif  
 .endif  .endif
 .if ${SHLIBDIR} != "/usr/lib"  .if ${SHLIBDIR} != "/usr/lib"
 _PROGLDOPTS+=   -Wl,-rpath-link,${DESTDIR}${SHLIBDIR}:${DESTDIR}/usr/lib \  _PROGLDOPTS+=   -Wl,-rpath-link,${DESTDIR}${SHLIBDIR}:${DESTDIR}/usr/lib \
Line 175  ${OBJS} ${LOBJS}: ${DPSRCS}
Line 172  ${OBJS} ${LOBJS}: ${DPSRCS}
   
 ${PROG}: .gdbinit ${LIBCRT0} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD}  ${PROG}: .gdbinit ${LIBCRT0} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD}
 .if !commands(${PROG})  .if !commands(${PROG})
           ${_MKTARGET_LINK}
 .if defined(DESTDIR)  .if defined(DESTDIR)
         ${_CCLINK} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} -nostdlib ${_PROGLDOPTS} ${LIBCRT0} ${LIBCRTBEGIN} ${OBJS} ${LDADD} -L${_GCC_LIBGCCDIR} -L${DESTDIR}/usr/lib ${_SUPCXX} -lgcc -lc -lgcc ${LIBCRTEND}          ${_CCLINK} -Wl,-nostdlib \
               ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${_PROGLDOPTS} \
               -B${_GCC_CRTDIR}/ -B${DESTDIR}/usr/lib/  \
               ${OBJS} ${LDADD} \
               -L${_GCC_LIBGCCDIR} -L${DESTDIR}/usr/lib
 .else  .else
         ${_CCLINK} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${_PROGLDOPTS} ${OBJS} ${LDADD}          ${_CCLINK} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${_PROGLDOPTS} ${OBJS} ${LDADD}
 .endif  # defined(DESTDIR)  .endif  # defined(DESTDIR)
Line 194  MAN= ${PROG}.1
Line 196  MAN= ${PROG}.1
   
 realall: ${PROG} ${SCRIPTS}  realall: ${PROG} ${SCRIPTS}
   
 cleanprog: cleanobjs cleanextra  cleanprog: .PHONY cleanobjs cleanextra
         rm -f a.out [Ee]rrs mklog core *.core .gdbinit ${PROG}          rm -f a.out [Ee]rrs mklog core *.core .gdbinit ${PROG}
   
 cleanobjs:  cleanobjs: .PHONY
 .if defined(OBJS) && !empty(OBJS)  .if defined(OBJS) && !empty(OBJS)
         rm -f ${OBJS} ${LOBJS}          rm -f ${OBJS} ${LOBJS}
 .endif  .endif
   
 cleanextra:  cleanextra: .PHONY
 .if defined(CLEANFILES) && !empty(CLEANFILES)  .if defined(CLEANFILES) && !empty(CLEANFILES)
         rm -f ${CLEANFILES}          rm -f ${CLEANFILES}
 .endif  .endif
   
 .if defined(SRCS) && !target(afterdepend)  
 afterdepend: .depend  
         @(TMP=/tmp/_depend$$$$; trap 'rm -f $$TMP ; exit 1' 1 2 3 13 15; \  
             sed -e 's/^\([^\.]*\).o[ ]*:/\1.o \1.ln:/' \  
               < .depend > $$TMP; \  
             mv $$TMP .depend)  
 .endif  
   
 .if defined(PROG) && !target(proginstall)  .if defined(PROG) && !target(proginstall)
 PROGNAME?=${PROG}  PROGNAME?=${PROG}
   
Line 222  proginstall:: ${DESTDIR}${BINDIR}/${PROG
Line 216  proginstall:: ${DESTDIR}${BINDIR}/${PROG
 .PRECIOUS: ${DESTDIR}${BINDIR}/${PROGNAME}  .PRECIOUS: ${DESTDIR}${BINDIR}/${PROGNAME}
   
 __proginstall: .USE  __proginstall: .USE
           ${_MKTARGET_INSTALL}
         ${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \          ${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
                 ${STRIPFLAG} ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}                  ${STRIPFLAG} ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
   
Line 241  ${DESTDIR}${BINDIR}/${PROGNAME}: .MADE
Line 236  ${DESTDIR}${BINDIR}/${PROGNAME}: .MADE
 .if !target(proginstall)  .if !target(proginstall)
 proginstall::  proginstall::
 .endif  .endif
   .PHONY:         proginstall
   
 .if defined(SCRIPTS) && !target(scriptsinstall)  .if defined(SCRIPTS) && !target(scriptsinstall)
 SCRIPTSDIR?=${BINDIR}  SCRIPTSDIR?=${BINDIR}
Line 252  scriptsinstall:: ${SCRIPTS:@S@${DESTDIR}
Line 248  scriptsinstall:: ${SCRIPTS:@S@${DESTDIR}
 .PRECIOUS: ${SCRIPTS:@S@${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}@}  .PRECIOUS: ${SCRIPTS:@S@${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}@}
   
 __scriptinstall: .USE  __scriptinstall: .USE
           ${_MKTARGET_INSTALL}
         ${INSTALL_FILE} \          ${INSTALL_FILE} \
             -o ${SCRIPTSOWN_${.ALLSRC:T}:U${SCRIPTSOWN}} \              -o ${SCRIPTSOWN_${.ALLSRC:T}:U${SCRIPTSOWN}} \
             -g ${SCRIPTSGRP_${.ALLSRC:T}:U${SCRIPTSGRP}} \              -g ${SCRIPTSGRP_${.ALLSRC:T}:U${SCRIPTSGRP}} \
Line 276  ${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDI
Line 273  ${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDI
 .if !target(scriptsinstall)  .if !target(scriptsinstall)
 scriptsinstall::  scriptsinstall::
 .endif  .endif
   .PHONY:         scriptsinstall
   
 lint: ${LOBJS}  lint: ${LOBJS}
 .if defined(LOBJS) && !empty(LOBJS)  .if defined(LOBJS) && !empty(LOBJS)
         ${LINT} ${LINTFLAGS} ${LDFLAGS:M-L*} ${LOBJS} ${LDADD}          ${LINT} ${LINTFLAGS} ${LDFLAGS:C/-L[  ]*/-L/Wg:M-L*} ${LOBJS} ${LDADD}
 .endif  .endif
   
 ##### Pull in related .mk logic  ##### Pull in related .mk logic
Legend:
Removed from v.1.189  
changed lines
  Added in v.1.200
CVSweb <webmaster@jp.NetBSD.org>