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.117.2.3 retrieving revision 1.193 diff -u -p -r1.117.2.3 -r1.193 --- src/share/mk/bsd.prog.mk 2001/04/25 09:53:03 1.117.2.3 +++ src/share/mk/bsd.prog.mk 2003/11/11 11:43:45 1.193 @@ -1,81 +1,103 @@ -# $NetBSD: bsd.prog.mk,v 1.117.2.3 2001/04/25 09:53:03 he Exp $ +# $NetBSD: bsd.prog.mk,v 1.193 2003/11/11 11:43:45 dsl 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 +.ifndef HOSTPROG + +.include +.include +.include + +.if defined(PROG_CXX) +PROG= ${PROG_CXX} .endif -.PHONY: cleanprog proginstall scriptsinstall +##### Basic targets +.PHONY: cleanextra cleanobjs cleanprog proginstall scriptsinstall realinstall: proginstall scriptsinstall -clean cleandir distclean: cleanprog +clean: cleanprog +##### PROG specific flags. +COPTS+= ${COPTS.${PROG}} +CPPFLAGS+= ${CPPFLAGS.${PROG}} +CXXFLAGS+= ${CXXFLAGS.${PROG}} +LDADD+= ${LDADD.${PROG}} +LDFLAGS+= ${LDFLAGS.${PROG}} +LDSTATIC+= ${LDSTATIC.${PROG}} + +##### Default values +CPPFLAGS+= ${DESTDIR:D-nostdinc ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include} +CXXFLAGS+= ${DESTDIR:D-nostdinc++ ${CPPFLAG_ISYSTEMXX} ${DESTDIR}/usr/include/g++} CFLAGS+= ${COPTS} +MKDEP_SUFFIXES?= .o .ln -# 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 +.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 SL SS SSL 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 +# Note: ${DESTDIR} will be expanded in the following rule +.MADE: ${LIB${_n}} +.endif +.endfor +.undef __bsd_prog_mk_system_libs -LIBBZ2?= ${DESTDIR}/usr/lib/libbz2.a -LIBC?= ${DESTDIR}/usr/lib/libc.a -LIBC_PIC?= ${DESTDIR}/usr/lib/libc_pic.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 -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 -LIBGSSAPI?= ${DESTDIR}/usr/lib/libgssapi.a -LIBHDB?= ${DESTDIR}/usr/lib/libhdb.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 -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 -LIBSL?= ${DESTDIR}/usr/lib/libsl.a -LIBTERMCAP?= ${DESTDIR}/usr/lib/libtermcap.a -LIBTELNET?= ${DESTDIR}/usr/lib/libtelnet.a -LIBUSB?= ${DESTDIR}/usr/lib/libusb.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 LIBSTDCXX +LIBSTDCXX= ${DESTDIR}/usr/lib/libstdc++.a +.MADE: ${LIBSTDCXX} +.endif + +##### Installed X11R6 library definitions +# E.g. LIBX11?=${DESTDIR}/usr/X11R6/lib/libX11.a +# etc.. +# +__bsd_prog_mk_x11r6_libs?= \ + dps expat fntstubs fontcache fontconfig fontenc freetype FS \ + GL GLU ICE lbxutil SM X11 Xau Xaw Xdmcp Xext Xfont Xft \ + Xi Xinerama xkbfile Xmu Xmuu Xpm Xrandr Xrender Xss Xt \ + XTrap Xtst Xv Xxf86dga Xxf86misc Xxf86vm + +.for _n in ${__bsd_prog_mk_x11r6_libs} +.ifndef LIB${_n:tu} +LIB${_n:tu}= ${DESTDIR}/usr/X11R6/lib/lib${_n}.a +# Note: ${DESTDIR} will be expanded in the following rule +.MADE: ${LIB${_n:tu}} +.endif +.endfor +.undef __bsd_prog_mk_x11r6_libs +##### Build and install rules .if defined(SHAREDSTRINGS) CLEANFILES+=strings .c.o: @@ -83,28 +105,24 @@ 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) +.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 +DPSRCS+= ${YHEADER:D${SRCS:M*.y:.y=.h}} +CLEANFILES+= ${SRCS:M*.l:.l=.c} ${SRCS:M*.y:.y=.c} +CLEANFILES+= ${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,18 +130,63 @@ LOBJS+= ${LSRCS:.c=.ln} ${SRCS:M*.c:.c= .endif .if defined(OBJS) && !empty(OBJS) -.NOPATH: ${OBJS} -.if defined(DESTDIR) +.NOPATH: ${OBJS} ${PROG} ${SRCS:M*.[ly]:C/\..$/.c/} ${YHEADER:D${SRCS:M*.y:.y=.h}} -${PROG}: ${LIBCRT0} ${DPSRCS} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD} - ${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} -nostdlib -Wl,-rpath-link,${DESTDIR}/usr/lib ${LIBCRT0} ${LIBCRTBEGIN} ${OBJS} ${LDADD} -L${DESTDIR}/usr/lib -lgcc -lc -lgcc ${LIBCRTEND} +_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} != "/usr/lib" +_PROGLDOPTS+= -Wl,-rpath-link,${DESTDIR}${SHLIBDIR}:${DESTDIR}/usr/lib \ + -R${SHLIBDIR} \ + -L${DESTDIR}${SHLIBDIR} +.elif ${SHLIBINSTALLDIR} != "/usr/lib" +_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 -${PROG}: ${LIBCRT0} ${DPSRCS} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD} - ${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${OBJS} ${LDADD} +${OBJS} ${LOBJS}: ${DPSRCS} +${PROG}: .gdbinit ${LIBCRT0} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD} +.if !commands(${PROG}) + ${_MKMSG_LINK} ${PROG} +.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} +.else + ${_CCLINK} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${_PROGLDOPTS} ${OBJS} ${LDADD} .endif # defined(DESTDIR) +.endif # !commands(${PROG}) + +${PROG}.ro: ${OBJS} ${DPADD} + ${LD} -r -dc -o ${.TARGET} ${OBJS} + .endif # defined(OBJS) && !empty(OBJS) .if !defined(MAN) @@ -133,16 +196,17 @@ MAN= ${PROG}.1 realall: ${PROG} ${SCRIPTS} -cleanprog: - rm -f a.out [Ee]rrs mklog core *.core \ - ${PROG} ${OBJS} ${LOBJS} ${CLEANFILES} - -.if defined(SRCS) && !target(afterdepend) -afterdepend: .depend - @(TMP=/tmp/_depend$$$$; \ - sed -e 's/^\([^\.]*\).o[ ]*:/\1.o \1.ln:/' \ - < .depend > $$TMP; \ - mv $$TMP .depend) +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 + +cleanextra: +.if defined(CLEANFILES) && !empty(CLEANFILES) + rm -f ${CLEANFILES} .endif .if defined(PROG) && !target(proginstall) @@ -150,18 +214,23 @@ PROGNAME?=${PROG} proginstall:: ${DESTDIR}${BINDIR}/${PROGNAME} .PRECIOUS: ${DESTDIR}${BINDIR}/${PROGNAME} -.if !defined(UPDATE) -.PHONY: ${DESTDIR}${BINDIR}/${PROGNAME} -.endif __proginstall: .USE - ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${STRIPFLAG} ${INSTPRIV} \ - -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ${.ALLSRC} ${.TARGET} + ${_MKTARGET_INSTALL} + ${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 +${DESTDIR}${BINDIR}/${PROGNAME}! .MADE .endif +.else ${DESTDIR}${BINDIR}/${PROGNAME}: ${PROG} __proginstall +.if !defined(BUILD) && !make(all) && !make(${PROG}) +${DESTDIR}${BINDIR}/${PROGNAME}: .MADE +.endif +.endif .endif .if !target(proginstall) @@ -176,22 +245,27 @@ 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 __scriptinstall: .USE - ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${INSTPRIV} \ + ${_MKTARGET_INSTALL} + ${INSTALL_FILE} \ -o ${SCRIPTSOWN_${.ALLSRC:T}:U${SCRIPTSOWN}} \ -g ${SCRIPTSGRP_${.ALLSRC:T}:U${SCRIPTSGRP}} \ -m ${SCRIPTSMODE_${.ALLSRC:T}:U${SCRIPTSMODE}} \ - ${.ALLSRC} ${.TARGET} + ${SYSPKGTAG} ${.ALLSRC} ${.TARGET} -.for S in ${SCRIPTS} +.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 +${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}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}: .MADE +.endif +.endif .endfor .endif @@ -204,13 +278,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