Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/share/mk/bsd.prog.mk,v rcsdiff: /ftp/cvs/cvsroot/src/share/mk/bsd.prog.mk,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.112.2.1 retrieving revision 1.142 diff -u -p -r1.112.2.1 -r1.142 --- src/share/mk/bsd.prog.mk 2000/06/22 16:17:57 1.112.2.1 +++ src/share/mk/bsd.prog.mk 2001/11/19 02:46:50 1.142 @@ -1,21 +1,15 @@ -# $NetBSD: bsd.prog.mk,v 1.112.2.1 2000/06/22 16:17:57 minoura Exp $ +# $NetBSD: bsd.prog.mk,v 1.142 2001/11/19 02:46:50 thorpej Exp $ # @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94 -.if !target(__initialized__) -__initialized__: -.if exists(${.CURDIR}/../Makefile.inc) -.include "${.CURDIR}/../Makefile.inc" -.endif -.include -.include -.include -.MAIN: all -.endif +.include +##### Basic targets .PHONY: cleanprog proginstall scriptsinstall realinstall: proginstall scriptsinstall -clean cleandir distclean: cleanprog +clean: cleanprog +##### Default values +CPPFLAGS+= ${DESTDIR:D-nostdinc ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include} CFLAGS+= ${COPTS} # ELF platforms depend on crtbegin.o and crtend.o @@ -32,24 +26,29 @@ LIBCRT0?= ${DESTDIR}/usr/lib/crt0.o LIBBZ2?= ${DESTDIR}/usr/lib/libbz2.a LIBC?= ${DESTDIR}/usr/lib/libc.a LIBC_PIC?= ${DESTDIR}/usr/lib/libc_pic.a +LIBCDK?= ${DESTDIR}/usr/lib/libcdk.a LIBCOM_ERR?= ${DESTDIR}/usr/lib/libcom_err.a LIBCOMPAT?= ${DESTDIR}/usr/lib/libcompat.a LIBCRYPT?= ${DESTDIR}/usr/lib/libcrypt.a LIBCRYPTO?= ${DESTDIR}/usr/lib/libcrypto.a +LIBCRYPTO_RC5?= ${DESTDIR}/usr/lib/libcrypto_rc5.a +LIBCRYPTO_IDEA?=${DESTDIR}/usr/lib/libcrypto_idea.a LIBCURSES?= ${DESTDIR}/usr/lib/libcurses.a LIBDBM?= ${DESTDIR}/usr/lib/libdbm.a LIBDES?= ${DESTDIR}/usr/lib/libdes.a LIBEDIT?= ${DESTDIR}/usr/lib/libedit.a +LIBFORM?= ${DESTDIR}/usr/lib/libform.a LIBGCC?= ${DESTDIR}/usr/lib/libgcc.a LIBGNUMALLOC?= ${DESTDIR}/usr/lib/libgnumalloc.a LIBGSSAPI?= ${DESTDIR}/usr/lib/libgssapi.a -LIBHDB?= ${DESTIDR}/usr/lib/libhdb.a +LIBHDB?= ${DESTDIR}/usr/lib/libhdb.a +LIBINTL?= ${DESTDIR}/usr/lib/libintl.a LIBIPSEC?= ${DESTDIR}/usr/lib/libipsec.a LIBKADM?= ${DESTDIR}/usr/lib/libkadm.a LIBKADM5CLNT?= ${DESTDIR}/usr/lib/libkadm5clnt.a LIBKADM5SRV?= ${DESTDIR}/usr/lib/libkadm5srv.a LIBKAFS?= ${DESTDIR}/usr/lib/libkafs.a -LIBKRB?= ${DESTDIR}/usr/lib/libkdb.a +LIBKDB?= ${DESTDIR}/usr/lib/libkdb.a LIBKRB?= ${DESTDIR}/usr/lib/libkrb.a LIBKRB5?= ${DESTDIR}/usr/lib/libkrb5.a LIBKSTREAM?= ${DESTDIR}/usr/lib/libkstream.a @@ -60,6 +59,7 @@ LIBMENU?= ${DESTDIR}/usr/lib/libmenu.a LIBOBJC?= ${DESTDIR}/usr/lib/libobjc.a LIBOSSAUDIO?= ${DESTDIR}/usr/lib/libossaudio.a LIBPCAP?= ${DESTDIR}/usr/lib/libpcap.a +LIBPCI?= ${DESTDIR}/usr/lib/libpci.a LIBPOSIX?= ${DESTDIR}/usr/lib/libposix.a LIBRESOLV?= ${DESTDIR}/usr/lib/libresolv.a LIBRMT?= ${DESTDIR}/usr/lib/librmt.a @@ -67,6 +67,7 @@ LIBROKEN?= ${DESTDIR}/usr/lib/libroken.a LIBRPCSVC?= ${DESTDIR}/usr/lib/librpcsvc.a LIBSKEY?= ${DESTDIR}/usr/lib/libskey.a LIBSS?= ${DESTDIR}/usr/lib/libss.a +LIBSSL?= ${DESTDIR}/usr/lib/libssl.a LIBSL?= ${DESTDIR}/usr/lib/libsl.a LIBTERMCAP?= ${DESTDIR}/usr/lib/libtermcap.a LIBTELNET?= ${DESTDIR}/usr/lib/libtelnet.a @@ -76,6 +77,7 @@ LIBWRAP?= ${DESTDIR}/usr/lib/libwrap.a LIBY?= ${DESTDIR}/usr/lib/liby.a LIBZ?= ${DESTDIR}/usr/lib/libz.a +##### Build and install rules .if defined(SHAREDSTRINGS) CLEANFILES+=strings .c.o: @@ -100,11 +102,8 @@ CLEANFILES+=strings .if defined(PROG) SRCS?= ${PROG}.c -DPSRCS+= ${SRCS:M*.l:.l=.c} ${SRCS:M*.y:.y=.c} -CLEANFILES+= ${DPSRCS} -.if defined(YHEADER) -CLEANFILES+= ${SRCS:M*.y:.y=.h} -.endif +DPSRCS+= ${SRCS:M*.[ly]:C/\..$/.c/} +CLEANFILES+= ${DPSRCS} ${YHEADER:D${SRCS:M*.y:.y=.h}} .if !empty(SRCS:N*.h:N*.sh:N*.fth) OBJS+= ${SRCS:N*.h:N*.sh:N*.fth:R:S/$/.o/g} @@ -112,16 +111,21 @@ LOBJS+= ${LSRCS:.c=.ln} ${SRCS:M*.c:.c= .endif .if defined(OBJS) && !empty(OBJS) -.NOPATH: ${OBJS} +.NOPATH: ${OBJS} ${PROG} ${SRCS:M*.[ly]:C/\..$/.c/} ${YHEADER:D${SRCS:M*.y:.y=.h}} + .if defined(DESTDIR) ${PROG}: ${LIBCRT0} ${DPSRCS} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD} - ${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} -nostdlib -L${DESTDIR}/usr/lib -Wl,-rpath-link,${DESTDIR}/usr/lib ${LIBCRT0} ${LIBCRTBEGIN} ${OBJS} ${LDADD} -lgcc -lc -lgcc ${LIBCRTEND} +.if !commands(${PROG}) + ${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} -nostdlib -Wl,-rpath-link,${DESTDIR}/usr/lib ${LIBCRT0} ${LIBCRTBEGIN} ${OBJS} ${LDADD} -L${DESTDIR}/usr/lib -lgcc -lc -lgcc ${LIBCRTEND} +.endif .else ${PROG}: ${LIBCRT0} ${DPSRCS} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD} +.if !commands(${PROG}) ${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${OBJS} ${LDADD} +.endif .endif # defined(DESTDIR) .endif # defined(OBJS) && !empty(OBJS) @@ -133,11 +137,20 @@ MAN= ${PROG}.1 realall: ${PROG} ${SCRIPTS} -cleanprog: - rm -f a.out [Ee]rrs mklog core *.core \ - ${PROG} ${OBJS} ${LOBJS} ${CLEANFILES} +cleanprog: cleanobjs cleanextra + rm -f a.out [Ee]rrs mklog core *.core ${PROG} + +cleanobjs: +.if defined(OBJS) && !empty(OBJS) + rm -f ${OBJS} ${LOBJS} +.endif + +cleanextra: +.if defined(CLEANFILES) && !empty(CLEANFILES) + rm -f ${CLEANFILES} +.endif -.if defined(SRCS) +.if defined(SRCS) && !target(afterdepend) afterdepend: .depend @(TMP=/tmp/_depend$$$$; \ sed -e 's/^\([^\.]*\).o[ ]*:/\1.o \1.ln:/' \ @@ -155,8 +168,8 @@ proginstall:: ${DESTDIR}${BINDIR}/${PROG .endif __proginstall: .USE - ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${STRIPFLAG} ${INSTPRIV} \ - -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ${.ALLSRC} ${.TARGET} + ${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${STRIPFLAG} ${.ALLSRC} ${.TARGET} .if !defined(BUILD) && !make(all) && !make(${PROG}) ${DESTDIR}${BINDIR}/${PROGNAME}: .MADE @@ -181,13 +194,13 @@ scriptsinstall:: ${SCRIPTS:@S@${DESTDIR} .endif __scriptinstall: .USE - ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${INSTPRIV} \ + ${INSTALL_FILE} \ -o ${SCRIPTSOWN_${.ALLSRC:T}:U${SCRIPTSOWN}} \ -g ${SCRIPTSGRP_${.ALLSRC:T}:U${SCRIPTSGRP}} \ -m ${SCRIPTSMODE_${.ALLSRC:T}:U${SCRIPTSMODE}} \ ${.ALLSRC} ${.TARGET} -.for S in ${SCRIPTS} +.for S in ${SCRIPTS:O:u} .if !defined(BUILD) && !make(all) && !make(${S}) ${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}: .MADE .endif @@ -204,6 +217,7 @@ lint: ${LOBJS} ${LINT} ${LINTFLAGS} ${LDFLAGS:M-L*} ${LOBJS} ${LDADD} .endif +##### Pull in related .mk logic .include .include .include @@ -212,5 +226,4 @@ lint: ${LOBJS} .include .include -# Make sure all of the standard targets are defined, even if they do nothing. -regress: +${TARGETS}: # ensure existence