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.174 retrieving revision 1.205 diff -u -p -r1.174 -r1.205 --- src/share/mk/bsd.prog.mk 2003/07/26 14:58:11 1.174 +++ src/share/mk/bsd.prog.mk 2005/02/20 00:35:02 1.205 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prog.mk,v 1.174 2003/07/26 14:58:11 mrg Exp $ +# $NetBSD: bsd.prog.mk,v 1.205 2005/02/20 00:35:02 christos Exp $ # @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94 .ifndef HOSTPROG @@ -7,18 +7,27 @@ .include .include +.if defined(PROG_CXX) +PROG= ${PROG_CXX} +.endif + ##### Basic targets -.PHONY: cleanextra cleanobjs cleanprog proginstall scriptsinstall realinstall: proginstall scriptsinstall 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_ISYSTEM} ${DESTDIR}/usr/include/g++} +CXXFLAGS+= ${DESTDIR:D-nostdinc++ ${CPPFLAG_ISYSTEMXX} ${DESTDIR}/usr/include/g++} CFLAGS+= ${COPTS} -.if ${MACHINE_ARCH} == "sparc64" -CFLAGS+= -mcmodel=medlow -.endif +MKDEP_SUFFIXES?= .o .ln # ELF platforms depend on crti.o, crtbegin.o, crtend.o, and crtn.o .if ${OBJECT_FMT} == "ELF" @@ -43,25 +52,43 @@ LIBCRT0= ${DESTDIR}/usr/lib/crt0.o .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}} +# E.g. +# LIBC?=${DESTDIR}/usr/lib/libc.a +# LIBX11?=${DESTDIR}/usr/X11R6/lib/libX11.a +# etc.. + +.for _lib in \ + asn1 bsdmalloc bz2 c c_pic cdk com_err compat crypt \ + crypto crypto_idea crypto_mdc2 crypto_rc5 \ + curses dbm des edit event \ + form fl g2c gcc gnumalloc gssapi hdb intl ipsec \ + kadm kadm5clnt kadm5srv kafs kdb krb krb5 kstream kvm l \ + m magic menu objc ossaudio pam pcap pci pmc posix pthread pthread_dbg \ + radius resolv rmt roken rpcsvc rt skey sl ss ssh ssl termcap \ + usbhid util wrap y z +.ifndef LIB${_lib:tu} +LIB${_lib:tu}= ${DESTDIR}/usr/lib/lib${_lib}.a +.MADE: ${LIB${_lib:tu}} # Note: ${DESTDIR} will be expanded .endif .endfor -.undef __bsd_prog_mk_system_libs + +.ifndef LIBSTDCXX +LIBSTDCXX= ${DESTDIR}/usr/lib/libstdc++.a +.MADE: ${LIBSTDCXX} +.endif + +.for _lib in \ + 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 +.ifndef LIB${_lib:tu} +LIB${_lib:tu}= ${DESTDIR}/usr/X11R6/lib/lib${_lib}.a +.MADE: ${LIB${_lib:tu}} # Note: ${DESTDIR} will be expanded +.endif +.endfor + ##### Build and install rules .if defined(SHAREDSTRINGS) @@ -78,10 +105,6 @@ CLEANFILES+=strings @rm -f x.cc .endif -.if defined(PROG_CXX) -PROG= ${PROG_CXX} -.endif - .if defined(PROG) .if defined(PROG_CXX) SRCS?= ${PROG}.cc @@ -89,8 +112,14 @@ SRCS?= ${PROG}.cc SRCS?= ${PROG}.c .endif -DPSRCS+= ${SRCS:M*.[ly]:C/\..$/.c/} -CLEANFILES+= ${DPSRCS} ${YHEADER:D${SRCS:M*.y:.y=.h}} +.if defined(RESCUEDIR) +CPPFLAGS+= -DRESCUEDIR=\"${RESCUEDIR}\" +.endif + +_YPSRCS= ${SRCS:M*.[ly]:C/\..$/.c/} ${YHEADER:D${SRCS:M*.y:.y=.h}} + +DPSRCS+= ${_YPSRCS} +CLEANFILES+= ${_YPSRCS} .if !empty(SRCS:N*.h:N*.sh:N*.fth) OBJS+= ${SRCS:N*.h:N*.sh:N*.fth:R:S/$/.o/g} @@ -98,29 +127,26 @@ LOBJS+= ${LSRCS:.c=.ln} ${SRCS:M*.c:.c= .endif .if defined(OBJS) && !empty(OBJS) -.NOPATH: ${OBJS} ${PROG} ${SRCS:M*.[ly]:C/\..$/.c/} ${YHEADER:D${SRCS:M*.y:.y=.h}} +.NOPATH: ${OBJS} ${PROG} ${_YPSRCS} _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} +.if ${SHLIBDIR} != "/usr/lib" _PROGLDOPTS+= -Wl,-rpath-link,${DESTDIR}${SHLIBDIR}:${DESTDIR}/usr/lib \ - -R${SHLIBDIR} -R/usr/lib \ + -R${SHLIBDIR} \ -L${DESTDIR}${SHLIBDIR} -.elif ${SHLIBINSTALLDIR} != ${LIBDIR} +.elif ${SHLIBINSTALLDIR} != "/usr/lib" _PROGLDOPTS+= -Wl,-rpath-link,${DESTDIR}${SHLIBINSTALLDIR}:${DESTDIR}/usr/lib \ -L${DESTDIR}${SHLIBINSTALLDIR} .endif .if defined(PROG_CXX) _CCLINK= ${CXX} -.if defined(CXX_SUPCXX) +.if ${USE_LIBSTDCXX} == "no" _SUPCXX= -lsupc++ -lm .else _SUPCXX= -lstdc++ -lm @@ -140,21 +166,25 @@ _CCLINK= ${CC} echo "source ${__gdbinit}" >> .gdbinit .endfor -.if defined(DESTDIR) +${OBJS} ${LOBJS}: ${DPSRCS} -${PROG}: .gdbinit ${LIBCRT0} ${DPSRCS} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD} +${PROG}: .gdbinit ${LIBCRT0} ${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 - + ${_MKTARGET_LINK} +.if defined(DESTDIR) + ${_CCLINK} -Wl,-nostdlib \ + ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${_PROGLDOPTS} \ + -B${_GCC_CRTDIR}/ -B${DESTDIR}/usr/lib/ \ + ${OBJS} ${LDADD} \ + -L${_GCC_LIBGCCDIR} -L${DESTDIR}/usr/lib .else - -${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 # !commands(${PROG}) + +${PROG}.ro: ${OBJS} ${DPADD} + ${LD} -r -dc -o ${.TARGET} ${OBJS} + .endif # defined(OBJS) && !empty(OBJS) .if !defined(MAN) @@ -164,27 +194,19 @@ MAN= ${PROG}.1 realall: ${PROG} ${SCRIPTS} -cleanprog: cleanobjs cleanextra +cleanprog: .PHONY cleanobjs cleanextra rm -f a.out [Ee]rrs mklog core *.core .gdbinit ${PROG} -cleanobjs: +cleanobjs: .PHONY .if defined(OBJS) && !empty(OBJS) rm -f ${OBJS} ${LOBJS} .endif -cleanextra: +cleanextra: .PHONY .if defined(CLEANFILES) && !empty(CLEANFILES) rm -f ${CLEANFILES} .endif -.if defined(SRCS) && !target(afterdepend) -afterdepend: .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} @@ -192,6 +214,7 @@ proginstall:: ${DESTDIR}${BINDIR}/${PROG .PRECIOUS: ${DESTDIR}${BINDIR}/${PROGNAME} __proginstall: .USE + ${_MKTARGET_INSTALL} ${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${STRIPFLAG} ${SYSPKGTAG} ${.ALLSRC} ${.TARGET} @@ -211,6 +234,7 @@ ${DESTDIR}${BINDIR}/${PROGNAME}: .MADE .if !target(proginstall) proginstall:: .endif +.PHONY: proginstall .if defined(SCRIPTS) && !target(scriptsinstall) SCRIPTSDIR?=${BINDIR} @@ -222,6 +246,7 @@ scriptsinstall:: ${SCRIPTS:@S@${DESTDIR} .PRECIOUS: ${SCRIPTS:@S@${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}@} __scriptinstall: .USE + ${_MKTARGET_INSTALL} ${INSTALL_FILE} \ -o ${SCRIPTSOWN_${.ALLSRC:T}:U${SCRIPTSOWN}} \ -g ${SCRIPTSGRP_${.ALLSRC:T}:U${SCRIPTSGRP}} \ @@ -246,10 +271,11 @@ ${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDI .if !target(scriptsinstall) scriptsinstall:: .endif +.PHONY: scriptsinstall lint: ${LOBJS} .if defined(LOBJS) && !empty(LOBJS) - ${LINT} ${LINTFLAGS} ${LDFLAGS:M-L*} ${LOBJS} ${LDADD} + ${LINT} ${LINTFLAGS} ${LDFLAGS:C/-L[ ]*/-L/Wg:M-L*} ${LOBJS} ${LDADD} .endif ##### Pull in related .mk logic @@ -258,8 +284,8 @@ lint: ${LOBJS} .include .include .include -.include .include +.include ${TARGETS}: # ensure existence