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.44 retrieving revision 1.150 diff -u -p -r1.44 -r1.150 --- src/share/mk/bsd.prog.mk 1994/06/30 05:31:21 1.44 +++ src/share/mk/bsd.prog.mk 2002/02/02 16:54:26 1.150 @@ -1,35 +1,86 @@ -# $NetBSD: bsd.prog.mk,v 1.44 1994/06/30 05:31:21 cgd Exp $ -# @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 +# $NetBSD: bsd.prog.mk,v 1.150 2002/02/02 16:54:26 veego Exp $ +# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94 -.if exists(${.CURDIR}/../Makefile.inc) -.include "${.CURDIR}/../Makefile.inc" -.endif - -.SUFFIXES: .out .o .c .cc .C .y .l .s .8 .7 .6 .5 .4 .3 .2 .1 .0 +.include +##### Basic targets +.PHONY: cleanextra cleanobjs cleanprog proginstall scriptsinstall +realinstall: proginstall scriptsinstall +clean: cleanprog + +##### Default values +CPPFLAGS+= ${DESTDIR:D-nostdinc ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include} +CXXFLAGS+= ${DESTDIR:D-nostdinc++ ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include/g++} CFLAGS+= ${COPTS} -LIBCRT0?= /usr/lib/crt0.o -LIBC?= /usr/lib/libc.a -LIBCOMPAT?= /usr/lib/libcompat.a -LIBCRYPT?= /usr/lib/libcrypt.a -LIBCURSES?= /usr/lib/libcurses.a -LIBDBM?= /usr/lib/libdbm.a -LIBDES?= /usr/lib/libdes.a -LIBL?= /usr/lib/libl.a -LIBKDB?= /usr/lib/libkdb.a -LIBKRB?= /usr/lib/libkrb.a -LIBKVM?= /usr/lib/libkvm.a -LIBM?= /usr/lib/libm.a -LIBMP?= /usr/lib/libmp.a -LIBPC?= /usr/lib/libpc.a -LIBPLOT?= /usr/lib/libplot.a -LIBRESOLV?= /usr/lib/libresolv.a -LIBRPCSVC?= /usr/lib/librpcsvc.a -LIBSKEY?= /usr/lib/libskey.a -LIBTERMCAP?= /usr/lib/libtermcap.a -LIBUTIL?= /usr/lib/libutil.a +# ELF platforms depend on crtbegin.o and crtend.o +.if ${OBJECT_FMT} == "ELF" +LIBCRTBEGIN?= ${DESTDIR}/usr/lib/crtbegin.o +LIBCRTEND?= ${DESTDIR}/usr/lib/crtend.o +_SHLINKER= ${SHLINKDIR}/ld.elf_so +.else +LIBCRTBEGIN?= +LIBCRTEND?= +_SHLINKER= ${SHLINKDIR}/ld.so +.endif + +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?= ${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 +LIBKDB?= ${DESTDIR}/usr/lib/libkdb.a +LIBKRB?= ${DESTDIR}/usr/lib/libkrb.a +LIBKRB5?= ${DESTDIR}/usr/lib/libkrb5.a +LIBKSTREAM?= ${DESTDIR}/usr/lib/libkstream.a +LIBKVM?= ${DESTDIR}/usr/lib/libkvm.a +LIBL?= ${DESTDIR}/usr/lib/libl.a +LIBM?= ${DESTDIR}/usr/lib/libm.a +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 +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 +LIBUSBHID?= ${DESTDIR}/usr/lib/libusbhid.a +LIBUTIL?= ${DESTDIR}/usr/lib/libutil.a +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: @@ -50,89 +101,156 @@ CLEANFILES+=strings @rm -f x.C .endif +.if defined(PROG_CXX) +PROG= ${PROG_CXX} +.endif .if defined(PROG) -SRCS?= ${PROG}.c -OBJS+= ${SRCS:N*.h:N*.sh:R:S/$/.o/g} - -.if defined(LDONLY) +.if defined(PROG_CXX) +SRCS?= ${PROG}.cc +.else +SRCS?= ${PROG}.c +.endif -${PROG}: ${LIBCRT0} ${OBJS} ${LIBC} ${DPADD} - ${LD} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${LIBCRT0} ${OBJS} ${LIBC} ${LDADD} +DPSRCS+= ${SRCS:M*.[ly]:C/\..$/.c/} +CLEANFILES+= ${DPSRCS} ${YHEADER:D${SRCS:M*.y:.y=.h}} -.else defined(LDONLY) +.if !empty(SRCS:N*.h:N*.sh:N*.fth) +OBJS+= ${SRCS:N*.h:N*.sh:N*.fth:R:S/$/.o/g} +LOBJS+= ${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.ln} +.endif -${PROG}: ${LIBCRT0} ${OBJS} ${LIBC} ${DPADD} - ${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${OBJS} ${LDADD} +.if defined(OBJS) && !empty(OBJS) +.NOPATH: ${OBJS} ${PROG} ${SRCS:M*.[ly]:C/\..$/.c/} ${YHEADER:D${SRCS:M*.y:.y=.h}} +_PROGLDOPTS= +.if ${SHLINKDIR} != "/usr/libexec" # XXX: change or remove if ld.so moves +_PROGLDOPTS+= -Wl,-dynamic-linker=${_SHLINKER} +.endif +.if ${SHLIBDIR} != ${LIBDIR} +_PROGLDOPTS+= -Wl,-rpath-link,${DESTDIR}${SHLIBDIR}:${DESTDIR}/usr/lib \ + -Wl,-rpath,${SHLIBDIR}:/usr/lib \ + -L${DESTDIR}${SHLIBDIR} .endif -.if !defined(MAN1) && !defined(MAN2) && !defined(MAN3) && \ - !defined(MAN4) && !defined(MAN5) && !defined(MAN6) && \ - !defined(MAN7) && !defined(MAN8) -MAN1= ${PROG}.0 +.if defined(PROG_CXX) +_CCLINK= ${CXX} +_SUPCXX= -lstdc++ -lm +.else +_CCLINK= ${CC} .endif + +.if defined(DESTDIR) + +${PROG}: ${LIBCRT0} ${DPSRCS} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD} +.if !commands(${PROG}) + ${_CCLINK} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} -nostdlib ${_PROGLDOPTS} ${LIBCRT0} ${LIBCRTBEGIN} ${OBJS} ${LDADD} -L${DESTDIR}/usr/lib ${_SUPCXX} -lgcc -lc -lgcc ${LIBCRTEND} .endif -.MAIN: all -all: ${PROG} _SUBDIRUSE +.else -.if !target(clean) -clean: _SUBDIRUSE - rm -f a.out [Ee]rrs mklog core *.core ${PROG} ${OBJS} ${CLEANFILES} +${PROG}: ${LIBCRT0} ${DPSRCS} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD} +.if !commands(${PROG}) + ${_CCLINK} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${_PROGLDOPTS} ${OBJS} ${LDADD} .endif -cleandir: _SUBDIRUSE clean +.endif # defined(DESTDIR) +.endif # defined(OBJS) && !empty(OBJS) + +.if !defined(MAN) +MAN= ${PROG}.1 +.endif # !defined(MAN) +.endif # defined(PROG) + +realall: ${PROG} ${SCRIPTS} -.if !target(install) -.if !target(beforeinstall) -beforeinstall: +cleanprog: cleanobjs cleanextra + rm -f a.out [Ee]rrs mklog core *.core ${PROG} + +cleanobjs: +.if defined(OBJS) && !empty(OBJS) + rm -f ${OBJS} ${LOBJS} .endif -.if !target(afterinstall) -afterinstall: + +cleanextra: +.if defined(CLEANFILES) && !empty(CLEANFILES) + rm -f ${CLEANFILES} .endif -.if !target(realinstall) -realinstall: -.if defined(PROG) - install ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${PROG} ${DESTDIR}${BINDIR} +.if defined(SRCS) && !target(afterdepend) +afterdepend: .depend + @(TMP=/tmp/_depend$$$$; \ + sed -e 's/^\([^\.]*\).o[ ]*:/\1.o \1.ln:/' \ + < .depend > $$TMP; \ + mv $$TMP .depend) .endif -.if defined(HIDEGAME) - (cd ${DESTDIR}/usr/games; rm -f ${PROG}; ln -s dm ${PROG}) + +.if defined(PROG) && !target(proginstall) +PROGNAME?=${PROG} + +proginstall:: ${DESTDIR}${BINDIR}/${PROGNAME} +.PRECIOUS: ${DESTDIR}${BINDIR}/${PROGNAME} +.if !defined(UPDATE) +.PHONY: ${DESTDIR}${BINDIR}/${PROGNAME} .endif + +__proginstall: .USE + ${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${STRIPFLAG} ${.ALLSRC} ${.TARGET} + +.if !defined(BUILD) && !make(all) && !make(${PROG}) +${DESTDIR}${BINDIR}/${PROGNAME}: .MADE +.endif +${DESTDIR}${BINDIR}/${PROGNAME}: ${PROG} __proginstall .endif -install: maninstall _SUBDIRUSE -.if defined(LINKS) && !empty(LINKS) - @set ${LINKS}; \ - while test $$# -ge 2; do \ - l=${DESTDIR}$$1; \ - shift; \ - t=${DESTDIR}$$1; \ - shift; \ - echo $$t -\> $$l; \ - rm -f $$t; \ - ln $$l $$t; \ - done; true +.if !target(proginstall) +proginstall:: .endif -maninstall: afterinstall -afterinstall: realinstall -realinstall: beforeinstall +.if defined(SCRIPTS) && !target(scriptsinstall) +SCRIPTSDIR?=${BINDIR} +SCRIPTSOWN?=${BINOWN} +SCRIPTSGRP?=${BINGRP} +SCRIPTSMODE?=${BINMODE} + +scriptsinstall:: ${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}}}@} +.if !defined(UPDATE) +.PHONY: ${SCRIPTS:@S@${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}@} .endif -.if !target(lint) -lint: ${SRCS} _SUBDIRUSE -.if defined(PROG) - @${LINT} ${LINTFLAGS} ${CFLAGS} ${.ALLSRC} | more 2>&1 +__scriptinstall: .USE + ${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:O:u} +.if !defined(BUILD) && !make(all) && !make(${S}) +${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}: .MADE .endif +${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}: ${S} __scriptinstall +.endfor .endif -.if !defined(NOMAN) -.include +.if !target(scriptsinstall) +scriptsinstall:: +.endif + +lint: ${LOBJS} +.if defined(LOBJS) && !empty(LOBJS) + ${LINT} ${LINTFLAGS} ${LDFLAGS:M-L*} ${LOBJS} ${LDADD} .endif -.include +##### Pull in related .mk logic +.include +.include +.include +.include +.include .include -.include +.include + +${TARGETS}: # ensure existence