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.104.4.1 retrieving revision 1.180 diff -u -p -r1.104.4.1 -r1.180 --- src/share/mk/bsd.prog.mk 1999/12/27 18:31:11 1.104.4.1 +++ src/share/mk/bsd.prog.mk 2003/07/31 13:47:32 1.180 @@ -1,69 +1,69 @@ -# $NetBSD: bsd.prog.mk,v 1.104.4.1 1999/12/27 18:31:11 wrstuden Exp $ +# $NetBSD: bsd.prog.mk,v 1.180 2003/07/31 13:47:32 lukem 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 +.ifndef HOSTPROG + +.include +.include +.include -.PHONY: cleanprog proginstall scriptsinstall +##### Basic targets +.PHONY: cleanextra cleanobjs cleanprog proginstall scriptsinstall realinstall: proginstall scriptsinstall -clean cleandir distclean: cleanprog +clean: cleanprog +##### Default values +CPPFLAGS+= ${DESTDIR:D-nostdinc ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include} +CXXFLAGS+= ${DESTDIR:D-nostdinc++ ${CPPFLAG_ISYSTEMXX} ${DESTDIR}/usr/include/g++} CFLAGS+= ${COPTS} +.if ${MACHINE_ARCH} == "sparc64" +CFLAGS+= -mcmodel=medlow +.endif -# ELF platforms depend on crtbegin.o and crtend.o +# ELF platforms depend on crti.o, crtbegin.o, crtend.o, and crtn.o .if ${OBJECT_FMT} == "ELF" -LIBCRTBEGIN?= ${DESTDIR}/usr/lib/crtbegin.o -LIBCRTEND?= ${DESTDIR}/usr/lib/crtend.o +.ifndef LIBCRTBEGIN +LIBCRTBEGIN= ${DESTDIR}/usr/lib/crti.o ${_GCC_CRTBEGIN} +.MADE: ${LIBCRTBEGIN} +.endif +.ifndef LIBCRTEND +LIBCRTEND= ${_GCC_CRTEND} ${DESTDIR}/usr/lib/crtn.o +.MADE: ${LIBCRTEND} +.endif +_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 -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 -LIBIPSEC?= ${DESTDIR}/usr/lib/libipsec.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 -LIBMENU?= ${DESTDIR}/usr/lib/libmenu.a -LIBMP?= ${DESTDIR}/usr/lib/libmp.a -LIBNTP?= ${DESTDIR}/usr/lib/libntp.a -LIBOBJC?= ${DESTDIR}/usr/lib/libobjc.a -LIBPC?= ${DESTDIR}/usr/lib/libpc.a -LIBPCAP?= ${DESTDIR}/usr/lib/libpcap.a -LIBPLOT?= ${DESTDIR}/usr/lib/libplot.a -LIBPOSIX?= ${DESTDIR}/usr/lib/libposix.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 +.ifndef LIBCRT0 +LIBCRT0= ${DESTDIR}/usr/lib/crt0.o +.MADE: ${LIBCRT0} +.endif + +##### Installed system library definitions +# E.g. LIBC?=${DESTDIR}/usr/lib/libc.a +# etc.. +# +__bsd_prog_mk_system_libs?= \ + BZ2 C C_PIC CDK COM_ERR COMPAT CRYPT CRYPTO CRYPTO_IDEA CRYPTO_MDC2 \ + CRYPTO_RC5 \ + CURSES DBM DES EDIT EVENT FORM GCC GNUMALLOC GSSAPI HDB INTL IPSEC \ + KADM KADM5CLNT KADM5SRV KAFS KDB KRB KRB5 KSTREAM KVM L M MENU \ + OBJC OSSAUDIO PCAP PCI PMC POSIX PTHREAD PTHREAD_DBG RESOLV RMT \ + ROKEN RPCSVC RT SKEY SS SSL SL TERMCAP USBHID UTIL WRAP Y Z + +.for _n in ${__bsd_prog_mk_system_libs} +.ifndef LIB${_n} +LIB${_n}= ${DESTDIR}/usr/lib/lib${_n:tl}.a +# XXX - note that ${DESTDIR} will be expanded in the following rule +.MADE: ${LIB${_n}} +.endif +.endfor +.undef __bsd_prog_mk_system_libs +##### Build and install rules .if defined(SHAREDSTRINGS) CLEANFILES+=strings .c.o: @@ -71,45 +71,88 @@ CLEANFILES+=strings @${CC} ${CFLAGS} -c x.c -o ${.TARGET} @rm -f x.c -.cc.o: +.cc.o .cpp.o .cxx.o .C.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 +.if defined(PROG_CXX) +PROG= ${PROG_CXX} +.endif .if defined(PROG) +.if defined(PROG_CXX) +SRCS?= ${PROG}.cc +.else SRCS?= ${PROG}.c +.endif DPSRCS+= ${SRCS:M*.l:.l=.c} ${SRCS:M*.y:.y=.c} -CLEANFILES+= ${DPSRCS} -.if defined(YHEADER) -CLEANFILES+= ${SRCS:M*.y:.y=.h} -.endif +CLEANFILES+= ${DPSRCS} ${YHEADER:D${SRCS:M*.y:.y=.h}} -.if !empty(SRCS:N*.h:N*.sh) -OBJS+= ${SRCS:N*.h:N*.sh:R:S/$/.o/g} +.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 .if defined(OBJS) && !empty(OBJS) -.NOPATH: ${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 +.if ${OBJECT_FMT} == "ELF" +_PROGLDOPTS+= -Wl,-dynamic-linker=${_SHLINKER} +.endif +.if ${OBJECT_FMT} == "a.out" +LIBCRT0= ${DESTDIR}/lib/crt0.o +.endif +.endif +.if ${SHLIBDIR} != ${LIBDIR} +_PROGLDOPTS+= -Wl,-rpath-link,${DESTDIR}${SHLIBDIR}:${DESTDIR}/usr/lib \ + -R${SHLIBDIR} \ + -L${DESTDIR}${SHLIBDIR} +.elif ${SHLIBINSTALLDIR} != ${LIBDIR} +_PROGLDOPTS+= -Wl,-rpath-link,${DESTDIR}${SHLIBINSTALLDIR}:${DESTDIR}/usr/lib \ + -L${DESTDIR}${SHLIBINSTALLDIR} +.endif + +.if defined(PROG_CXX) +_CCLINK= ${CXX} +.if ${USE_LIBSTDCXX} == "no" +_SUPCXX= -lsupc++ -lm +.else +_SUPCXX= -lstdc++ -lm +.endif +.else +_CCLINK= ${CC} +.endif + +.gdbinit: + rm -f .gdbinit +.if defined(DESTDIR) && !empty(DESTDIR) + echo "set solib-absolute-prefix ${DESTDIR}" > .gdbinit +.else + touch .gdbinit +.endif +.for __gdbinit in ${GDBINIT} + echo "source ${__gdbinit}" >> .gdbinit +.endfor + .if defined(DESTDIR) -${PROG}: ${LIBCRT0} ${DPSRCS} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD} - ${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} -nostdlib -L${DESTDIR}/usr/lib ${LIBCRT0} ${LIBCRTBEGIN} ${OBJS} ${LDADD} -lgcc -lc -lgcc ${LIBCRTEND} +${PROG}: .gdbinit ${LIBCRT0} ${DPSRCS} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD} +.if !commands(${PROG}) + ${_CCLINK} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} -nostdlib ${_PROGLDOPTS} ${LIBCRT0} ${LIBCRTBEGIN} ${OBJS} ${LDADD} -L${_GCC_LIBGCCDIR} -L${DESTDIR}/usr/lib ${_SUPCXX} -lgcc -lc -lgcc ${LIBCRTEND} +.endif .else -${PROG}: ${LIBCRT0} ${DPSRCS} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD} - ${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${OBJS} ${LDADD} +${PROG}: .gdbinit ${LIBCRT0} ${DPSRCS} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD} +.if !commands(${PROG}) + ${_CCLINK} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${_PROGLDOPTS} ${OBJS} ${LDADD} +.endif .endif # defined(DESTDIR) .endif # defined(OBJS) && !empty(OBJS) @@ -119,34 +162,50 @@ MAN= ${PROG}.1 .endif # !defined(MAN) .endif # defined(PROG) -all: ${PROG} +realall: ${PROG} ${SCRIPTS} + +cleanprog: cleanobjs cleanextra + rm -f a.out [Ee]rrs mklog core *.core .gdbinit ${PROG} + +cleanobjs: +.if defined(OBJS) && !empty(OBJS) + rm -f ${OBJS} ${LOBJS} +.endif -cleanprog: - rm -f a.out [Ee]rrs mklog core *.core \ - ${PROG} ${OBJS} ${LOBJS} ${CLEANFILES} +cleanextra: +.if defined(CLEANFILES) && !empty(CLEANFILES) + rm -f ${CLEANFILES} +.endif -.if defined(SRCS) +.if defined(SRCS) && !target(afterdepend) afterdepend: .depend - @(TMP=/tmp/_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) -PROGNAME?= ${PROG} +PROGNAME?=${PROG} + proginstall:: ${DESTDIR}${BINDIR}/${PROGNAME} -.if !defined(UPDATE) -.PHONY: ${DESTDIR}${BINDIR}/${PROGNAME} +.PRECIOUS: ${DESTDIR}${BINDIR}/${PROGNAME} + +__proginstall: .USE + ${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${STRIPFLAG} ${SYSPKGTAG} ${.ALLSRC} ${.TARGET} + +.if ${MKUPDATE} == "no" +${DESTDIR}${BINDIR}/${PROGNAME}! ${PROG} __proginstall +.if !defined(BUILD) && !make(all) && !make(${PROG}) +${DESTDIR}${BINDIR}/${PROGNAME}! .MADE .endif +.else +${DESTDIR}${BINDIR}/${PROGNAME}: ${PROG} __proginstall .if !defined(BUILD) && !make(all) && !make(${PROG}) ${DESTDIR}${BINDIR}/${PROGNAME}: .MADE .endif - -.PRECIOUS: ${DESTDIR}${BINDIR}/${PROGNAME} -${DESTDIR}${BINDIR}/${PROGNAME}: ${PROG} - ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${STRIPFLAG} ${INSTPRIV} \ - -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ${.ALLSRC} ${.TARGET} +.endif .endif .if !target(proginstall) @@ -158,30 +217,29 @@ SCRIPTSDIR?=${BINDIR} SCRIPTSOWN?=${BINOWN} SCRIPTSGRP?=${BINGRP} SCRIPTSMODE?=${BINMODE} -.for S in ${SCRIPTS} -SCRIPTSDIR_${S}?=${SCRIPTSDIR} -SCRIPTSOWN_${S}?=${SCRIPTSOWN} -SCRIPTSGRP_${S}?=${SCRIPTSGRP} -SCRIPTSMODE_${S}?=${SCRIPTSMODE} -.if defined(SCRIPTSNAME) -SCRIPTSNAME_${S} ?= ${SCRIPTSNAME} -.else -SCRIPTSNAME_${S} ?= ${S:T:R} -.endif -SCRIPTSDIR_${S} ?= ${SCRIPTSDIR} -scriptsinstall:: ${DESTDIR}${SCRIPTSDIR_${S}}/${SCRIPTSNAME_${S}} -.if !defined(UPDATE) -.PHONY: ${DESTDIR}${SCRIPTSDIR_${S}}/${SCRIPTSNAME_${S}} + +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}}}@} + +__scriptinstall: .USE + ${INSTALL_FILE} \ + -o ${SCRIPTSOWN_${.ALLSRC:T}:U${SCRIPTSOWN}} \ + -g ${SCRIPTSGRP_${.ALLSRC:T}:U${SCRIPTSGRP}} \ + -m ${SCRIPTSMODE_${.ALLSRC:T}:U${SCRIPTSMODE}} \ + ${SYSPKGTAG} ${.ALLSRC} ${.TARGET} + +.for S in ${SCRIPTS:O:u} +.if ${MKUPDATE} == "no" +${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}! ${S} __scriptinstall +.if !defined(BUILD) && !make(all) && !make(${S}) +${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}! .MADE .endif +.else +${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}: ${S} __scriptinstall .if !defined(BUILD) && !make(all) && !make(${S}) -${DESTDIR}${SCRIPTSDIR_${S}}/${SCRIPTSNAME_${S}}: .MADE +${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}: .MADE +.endif .endif - -.PRECIOUS: ${DESTDIR}${SCRIPTSDIR_${S}}/${SCRIPTSNAME_${S}} -${DESTDIR}${SCRIPTSDIR_${S}}/${SCRIPTSNAME_${S}}: ${S} - ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${INSTPRIV} \ - -o ${SCRIPTSOWN_${S}} -g ${SCRIPTSGRP_${S}} -m ${SCRIPTSMODE_${S}} \ - ${.ALLSRC} ${.TARGET} .endfor .endif @@ -194,13 +252,15 @@ lint: ${LOBJS} ${LINT} ${LINTFLAGS} ${LDFLAGS:M-L*} ${LOBJS} ${LDADD} .endif +##### Pull in related .mk logic .include .include .include .include .include -.include .include +.include + +${TARGETS}: # ensure existence -# Make sure all of the standard targets are defined, even if they do nothing. -regress: +.endif # HOSTPROG