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.3 retrieving revision 1.64 diff -u -p -r1.3 -r1.64 --- src/share/mk/bsd.prog.mk 1993/03/23 07:26:55 1.3 +++ src/share/mk/bsd.prog.mk 1997/03/27 09:10:10 1.64 @@ -1,38 +1,45 @@ +# $NetBSD: bsd.prog.mk,v 1.64 1997/03/27 09:10:10 mycroft Exp $ # @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 .if exists(${.CURDIR}/../Makefile.inc) .include "${.CURDIR}/../Makefile.inc" .endif -.SUFFIXES: .out .o .c .y .l .s .8 .7 .6 .5 .4 .3 .2 .1 .0 +.include -.8.0 .7.0 .6.0 .5.0 .4.0 .3.0 .2.0 .1.0: - nroff -mandoc ${.IMPSRC} > ${.TARGET} +.SUFFIXES: .out .o .c .cc .C .y .l .s .8 .7 .6 .5 .4 .3 .2 .1 .0 -CFLAGS+=${COPTS} +CFLAGS+= ${COPTS} -STRIP?= -s - -BINGRP?= bin -BINOWN?= bin -BINMODE?= 555 - -LIBC?= /usr/lib/libc.a -LIBCOMPAT?= /usr/lib/libcompat.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 -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 -LIBRPC?= /usr/lib/sunrpc.a -LIBTERM?= /usr/lib/libterm.a -LIBUTIL?= /usr/lib/libutil.a +LIBCRT0?= ${DESTDIR}/usr/lib/crt0.o +LIBC?= ${DESTDIR}/usr/lib/libc.a +LIBC_PIC?= ${DESTDIR}/usr/lib/libc_pic.a +LIBCOMPAT?= ${DESTDIR}/usr/lib/libcompat.a +LIBCRYPT?= ${DESTDIR}/usr/lib/libcrypt.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 +LIBGCC?= ${DESTDIR}/usr/lib/libgcc.a +LIBGNUMALLOC?= ${DESTDIR}/usr/lib/libgnumalloc.a +LIBKDB?= ${DESTDIR}/usr/lib/libkdb.a +LIBKRB?= ${DESTDIR}/usr/lib/libkrb.a +LIBKVM?= ${DESTDIR}/usr/lib/libkvm.a +LIBL?= ${DESTDIR}/usr/lib/libl.a +LIBM?= ${DESTDIR}/usr/lib/libm.a +LIBMP?= ${DESTDIR}/usr/lib/libmp.a +LIBPC?= ${DESTDIR}/usr/lib/libpc.a +LIBPCAP?= ${DESTDIR}/usr/lib/libpcap.a +LIBPLOT?= ${DESTDIR}/usr/lib/libplot.a +LIBRESOLV?= ${DESTDIR}/usr/lib/libresolv.a +LIBRPCSVC?= ${DESTDIR}/usr/lib/librpcsvc.a +LIBSKEY?= ${DESTDIR}/usr/lib/libskey.a +LIBTERMCAP?= ${DESTDIR}/usr/lib/libtermcap.a +LIBTELNET?= ${DESTDIR}/usr/lib/libtelnet.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 .if defined(SHAREDSTRINGS) CLEANFILES+=strings @@ -40,69 +47,67 @@ CLEANFILES+=strings ${CC} -E ${CFLAGS} ${.IMPSRC} | xstr -c - @${CC} ${CFLAGS} -c x.c -o ${.TARGET} @rm -f x.c -.endif - -.if defined(PROG) -.if defined(SRCS) -OBJS+= ${SRCS:R:S/$/.o/g} +.cc.o: + ${CXX} -E ${CXXFLAGS} ${.IMPSRC} | xstr -c - + @mv -f x.c x.cc + @${CXX} ${CXXFLAGS} -c x.cc -o ${.TARGET} + @rm -f x.cc + +.C.o: + ${CXX} -E ${CXXFLAGS} ${.IMPSRC} | xstr -c - + @mv -f x.c x.C + @${CXX} ${CXXFLAGS} -c x.C -o ${.TARGET} + @rm -f x.C +.endif -${PROG}: ${OBJS} ${LIBC} ${DPADD} - ${CC} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD} -.else defined(PROG) +.if defined(PROG) +SRCS?= ${PROG}.c +.if !empty(SRCS:N*.h:N*.sh) +OBJS+= ${SRCS:N*.h:N*.sh:R:S/$/.o/g} +LOBJS+= ${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.ln} +.endif -SRCS= ${PROG}.c +.if defined(OBJS) && !empty(OBJS) +.if defined(DESTDIR) -${PROG}: ${SRCS} ${LIBC} ${DPADD} - ${CC} ${CFLAGS} -o ${.TARGET} ${.CURDIR}/${SRCS} ${LDADD} +${PROG}: ${LIBCRT0} ${OBJS} ${LIBC} ${DPADD} + ${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} -nostdlib -L${DESTDIR}/usr/lib ${LIBCRT0} ${OBJS} ${LDADD} -lgcc -lc -lgcc -MKDEP= -p +.else -.endif +${PROG}: ${LIBCRT0} ${OBJS} ${LIBC} ${DPADD} + ${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${OBJS} ${LDADD} -.if !defined(MAN1) && !defined(MAN2) && !defined(MAN3) && \ - !defined(MAN4) && !defined(MAN5) && !defined(MAN6) && \ - !defined(MAN7) && !defined(MAN8) && !defined(NOMAN) -MAN1= ${PROG}.0 -.endif -.endif -MANALL= ${MAN1} ${MAN2} ${MAN3} ${MAN4} ${MAN5} ${MAN6} ${MAN7} ${MAN8} +.endif # defined(DESTDIR) +.endif # defined(OBJS) && !empty(OBJS) -_PROGSUBDIR: .USE -.if defined(SUBDIR) && !empty(SUBDIR) - @for entry in ${SUBDIR}; do \ - (echo "===> $$entry"; \ - if test -d ${.CURDIR}/$${entry}.${MACHINE}; then \ - cd ${.CURDIR}/$${entry}.${MACHINE}; \ - else \ - cd ${.CURDIR}/$${entry}; \ - fi; \ - ${MAKE} ${.TARGET:S/realinstall/install/:S/.depend/depend/}); \ - done -.endif +.if !defined(MAN) +MAN= ${PROG}.1 +.endif # !defined(MAN) +.endif # defined(PROG) .MAIN: all -all: ${PROG} ${MANALL} _PROGSUBDIR +all: ${PROG} _SUBDIRUSE .if !target(clean) -clean: _PROGSUBDIR - rm -f a.out [Ee]rrs mklog core ${PROG} ${OBJS} ${CLEANFILES} -.endif +cleanprog: + rm -f a.out [Ee]rrs mklog core *.core \ + ${PROG} ${OBJS} ${LOBJS} ${CLEANFILES} -.if !target(cleandir) -cleandir: _PROGSUBDIR - rm -f a.out [Ee]rrs mklog core ${PROG} ${OBJS} ${CLEANFILES} - rm -f .depend ${MANALL} +clean: _SUBDIRUSE cleanprog +cleandir: _SUBDIRUSE cleanprog +.else +cleandir: _SUBDIRUSE clean .endif -# some of the rules involve .h sources, so remove them from mkdep line -.if !target(depend) -depend: .depend _PROGSUBDIR -.depend: ${SRCS} -.if defined(PROG) - mkdep ${MKDEP} ${CFLAGS:M-[ID]*} ${.ALLSRC:M*.c} -.endif +.if defined(SRCS) +afterdepend: .depend + @(TMP=/tmp/_depend$$$$; \ + sed -e 's/^\([^\.]*\).o[ ]*:/\1.o \1.ln:/' \ + < .depend > $$TMP; \ + mv $$TMP .depend) .endif .if !target(install) @@ -113,75 +118,106 @@ beforeinstall: afterinstall: .endif -realinstall: _PROGSUBDIR +.if !target(realinstall) + .if defined(PROG) - install ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${PROG} ${DESTDIR}${BINDIR} +PROGNAME?= ${PROG} +proginstall:: ${DESTDIR}${BINDIR}/${PROGNAME} +.if !defined(UPDATE) +.PHONY: ${DESTDIR}${BINDIR}/${PROGNAME} +.endif +.if !defined(BUILD) +${DESTDIR}${BINDIR}/${PROGNAME}: .MADE +.endif + +${DESTDIR}${BINDIR}/${PROGNAME}: ${PROG} + ${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${.ALLSRC} ${.TARGET} +.endif + +.if defined(FILES) +FILESDIR?=${BINDIR} +FILESOWN?=${BINOWN} +FILESGRP?=${BINGRP} +FILESMODE?=${NONBINMODE} +.for F in ${FILES} +FILESDIR_${F}?=${FILESDIR} +FILESOWN_${F}?=${FILESOWN} +FILESGRP_${F}?=${FILESGRP} +FILESMODE_${F}?=${FILESMODE} +.if defined(FILESNAME) +FILESNAME_${F} ?= ${FILESNAME} +.else +FILESNAME_${F} ?= ${F:T} .endif -.if defined(HIDEGAME) - (cd ${DESTDIR}/usr/games; rm -f ${PROG}; ln -s dm ${PROG}; \ - chown games.bin ${PROG}) -.endif -.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 +FILESDIR_${F} ?= ${FILESDIR} +proginstall:: ${DESTDIR}${FILESDIR_${F}}/${FILESNAME_${F}} +.if !defined(UPDATE) +.PHONY: ${DESTDIR}${FILESDIR_${F}}/${FILESNAME_${F}} +.endif +.if !defined(BUILD) +${DESTDIR}${FILESDIR_${F}}/${FILESNAME_${F}}: .MADE .endif -install: maninstall -maninstall: afterinstall -afterinstall: realinstall -realinstall: beforeinstall +${DESTDIR}${FILESDIR_${F}}/${FILESNAME_${F}}: ${F} + ${INSTALL} ${COPY} -o ${FILESOWN_${F}} -g ${FILESGRP_${F}} \ + -m ${FILESMODE_${F}} ${.ALLSRC} ${.TARGET} +.endfor .endif -.if !target(lint) -lint: ${SRCS} _PROGSUBDIR -.if defined(PROG) - @${LINT} ${LINTFLAGS} ${CFLAGS} ${.ALLSRC} | more 2>&1 +.if defined(SCRIPTS) +.for S in ${SCRIPTS} +.if defined(SCRIPTSNAME) +SCRIPTSNAME_${S} ?= ${SCRIPTSNAME} +.else +SCRIPTSNAME_${S} ?= ${S:T:R} +.endif +proginstall:: ${DESTDIR}${BINDIR}/${SCRIPTSNAME_${S}} +.if !defined(UPDATE) +.PHONY: ${DESTDIR}${BINDIR}/${SCRIPTSNAME_${S}} .endif +.if !defined(BUILD) +${DESTDIR}${BINDIR}/${SCRIPTSNAME_${S}}: .MADE .endif -.if !target(obj) -.if defined(NOOBJ) -obj: _PROGSUBDIR +${DESTDIR}${BINDIR}/${SCRIPTSNAME_${S}}: ${S} + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${.ALLSRC} ${.TARGET} +.endfor +.endif + +.if target(proginstall) +realinstall: proginstall .else -obj: _PROGSUBDIR - @cd ${.CURDIR}; rm -f obj > /dev/null 2>&1 || true; \ - here=`pwd`; subdir=`echo $$here | sed 's,^/usr/src/,,'`; \ - if test $$here != $$subdir ; then \ - dest=/usr/obj/$$subdir ; \ - echo "$$here -> $$dest"; ln -s $$dest obj; \ - if test -d /usr/obj -a ! -d $$dest; then \ - mkdir -p $$dest; \ - else \ - true; \ - fi; \ - else \ - true ; \ - dest=$$here/obj ; \ - echo "making $$here/obj" ; \ - if test ! -d obj ; then \ - mkdir $$here/obj; \ - fi ; \ - fi; +realinstall: .endif .endif -.if !target(tags) -tags: ${SRCS} _PROGSUBDIR -.if defined(PROG) - -cd ${.CURDIR}; ctags -f /dev/stdout ${.ALLSRC} | \ - sed "s;\${.CURDIR}/;;" > tags +install: ${MANINSTALL} _SUBDIRUSE linksinstall + +${MANINSTALL}: afterinstall +afterinstall: realinstall +realinstall: beforeinstall +.endif + +.if !target(lint) +lint: ${LOBJS} +.if defined(LOBJS) && !empty(LOBJS) + @${LINT} ${LINTFLAGS} ${LDFLAGS:M-L*} ${LOBJS} ${LDADD} .endif .endif .if !defined(NOMAN) .include .endif + +.if !defined(NONLS) +.include +.endif + +.include +.include +.include +.include +.include +.include