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.250 retrieving revision 1.269 diff -u -p -r1.250 -r1.269 --- src/share/mk/bsd.prog.mk 2010/10/31 11:52:53 1.250 +++ src/share/mk/bsd.prog.mk 2011/10/16 01:24:05 1.269 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prog.mk,v 1.250 2010/10/31 11:52:53 mbalmer Exp $ +# $NetBSD: bsd.prog.mk,v 1.269 2011/10/16 01:24:05 christos Exp $ # @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94 .ifndef HOSTPROG @@ -14,7 +14,6 @@ ##### Basic targets realinstall: proginstall scriptsinstall -clean: cleanprog .gdbinit: rm -f .gdbinit @@ -27,10 +26,7 @@ clean: cleanprog echo "source ${__gdbinit}" >> .gdbinit .endfor -cleanobjs: .PHONY - -cleanprog: .PHONY cleanobjs cleanextra - rm -f a.out [Ee]rrs mklog core *.core .gdbinit +CLEANFILES+= a.out [Ee]rrs mklog core *.core .gdbinit .if defined(SHAREDSTRINGS) CLEANFILES+=strings @@ -52,13 +48,6 @@ AFLAGS+= ${PIE_AFLAGS} LDFLAGS+= ${PIE_LDFLAGS} .endif -##### Default values -.if empty(CPPFLAGS:M-nostdinc) -CPPFLAGS+= ${DESTDIR:D-nostdinc ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include} -.endif -.if empty(CXXFLAGS:M-nostdinc++) -CXXFLAGS+= ${DESTDIR:D-nostdinc++ ${CPPFLAG_ISYSTEMXX} ${DESTDIR}/usr/include/g++} -.endif CFLAGS+= ${COPTS} OBJCFLAGS+= ${OBJCOPTS} MKDEP_SUFFIXES?= .o .ln @@ -91,22 +80,114 @@ LIBCRT0= ${DESTDIR}/usr/lib/crt0.o # LIBC?=${DESTDIR}/usr/lib/libc.a # LIBX11?=${DESTDIR}/usr/X11R7/lib/libX11.a # etc.. +# NB: If you are a library here, add it in bsd.README .for _lib in \ - archive asn1 bluetooth bsdmalloc bz2 c c_pic cdk com_err compat \ - crypt crypto crypto_idea crypto_mdc2 crypto_rc5 \ - curses dbm des edit event \ - fetch form fl g2c gcc gnumalloc gssapi hdb heimntlm hx509 intl ipsec \ - kadm5clnt kadm5srv kafs krb5 kvm l lber ldap ldap_r lua \ - m magic menu objc ossaudio pam pcap pci pmc posix pthread pthread_dbg \ - puffs radius resolv rmt roken rpcsvc rt rump rumpuser skey sl ss \ - ssh ssl termcap usbhid util wrap y z bind9 dns lwres isccfg isccc isc \ - \ - rumpfs_cd9660fs rumpfs_efs rumpfs_ext2fs rumpfs_ffs rumpfs_hfs \ - rumpfs_lfs rumpfs_msdosfs rumpfs_nfs rumpfs_ntfs rumpfs_syspuffs \ - rumpfs_tmpfs rumpfs_udf rumpfs_ufs + archive \ + asn1 \ + atf_c \ + atf_cxx \ + bind9 \ + bluetooth \ + bsdmalloc \ + bz2 \ + c \ + c_pic \ + com_err \ + compat \ + crt0 \ + crypt \ + crypto \ + crypto_idea \ + crypto_mdc2 \ + crypto_rc5 \ + curses \ + dbm \ + des \ + dns \ + edit \ + event \ + fetch \ + fl \ + form \ + g2c \ + gcc \ + gnumalloc \ + gssapi \ + hdb \ + heimbase \ + heimntlm \ + hx509 \ + intl \ + ipsec \ + isc \ + isccc \ + isccfg \ + kadm5clnt \ + kadm5srv \ + kafs \ + krb5 \ + kvm \ + l \ + lber \ + ldap \ + ldap_r \ + lua \ + lwres \ + m \ + magic \ + menu \ + objc \ + ossaudio \ + pam \ + pcap \ + pci \ + pmc \ + posix \ + pthread \ + pthread_dbg \ + puffs \ + quota \ + radius \ + resolv \ + rmt \ + roken \ + rpcsvc \ + rt \ + rump \ + rumpfs_cd9660fs \ + rumpfs_efs \ + rumpfs_ext2fs \ + rumpfs_ffs \ + rumpfs_hfs \ + rumpfs_lfs \ + rumpfs_msdosfs \ + rumpfs_nfs \ + rumpfs_ntfs \ + rumpfs_syspuffs \ + rumpfs_tmpfs \ + rumpfs_udf \ + rumpfs_ufs \ + rumpuser \ + saslc \ + skey \ + sl \ + sqlite3 \ + ss \ + ssh \ + ssl \ + ssp \ + stdcxx \ + supcxx \ + terminfo \ + usbhid \ + util \ + wind \ + wrap \ + y \ + z .ifndef LIB${_lib:tu} -LIB${_lib:tu}= ${DESTDIR}/usr/lib/lib${_lib}.a +LIB${_lib:tu}= ${DESTDIR}/usr/lib/lib${_lib:S/xx/++/:S/atf_c/atf-c/}.a .MADE: ${LIB${_lib:tu}} # Note: ${DESTDIR} will be expanded .endif .endfor @@ -118,9 +199,10 @@ PAM_STATIC_LDADD+= -lssh PAM_STATIC_DPADD+= ${LIBSSH} .endif .if (${MKKERBEROS} != "no") -PAM_STATIC_LDADD+= -lkafs -lkrb5 -lhx509 -lasn1 -lroken -lcom_err -lcrypto -PAM_STATIC_DPADD+= ${LIBKAFS} ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBROKEN} \ - ${LIBCOM_ERR} ${LIBCRYPTO} +PAM_STATIC_LDADD+= -lkafs -lkrb5 -lhx509 -lwind -lasn1 \ + -lroken -lcom_err -lheimbase -lcrypto +PAM_STATIC_DPADD+= ${LIBKAFS} ${LIBKRB5} ${LIBHX509} ${LIBWIND} ${LIBASN1} \ + ${LIBROKEN} ${LIBCOM_ERR} ${LIBHEIMBASE} ${LIBCRYPTO} .endif .if (${MKSKEY} != "no") PAM_STATIC_LDADD+= -lskey @@ -133,22 +215,44 @@ PAM_STATIC_LDADD= PAM_STATIC_DPADD= .endif -# These need + -> X transformations -.ifndef LIBSTDCXX -LIBSTDCXX= ${DESTDIR}/usr/lib/libstdc++.a -.MADE: ${LIBSTDCXX} -.endif - -.ifndef LIBSUPCXX -LIBSUPCXX= ${DESTDIR}/usr/lib/libsupc++.a -.MADE: ${LIBSUPCXX} -.endif - +# NB: If you are a library here, add it in bsd.README .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 + FS \ + GL \ + GLU \ + ICE \ + SM \ + X11 \ + XTrap \ + Xau \ + Xaw \ + Xdmcp \ + Xext \ + Xfont \ + Xft \ + Xi \ + Xinerama \ + Xmu \ + Xmuu \ + Xpm \ + Xrandr \ + Xrender \ + Xss \ + Xt \ + Xtst \ + Xv \ + Xxf86dga \ + Xxf86misc \ + Xxf86vm \ + dps \ + expat \ + fntstubs \ + fontcache \ + fontconfig \ + fontenc \ + freetype \ + lbxutil \ + xkbfile .ifndef LIB${_lib:tu} LIB${_lib:tu}= ${DESTDIR}${X11USRLIBDIR}/lib${_lib}.a .MADE: ${LIB${_lib:tu}} # Note: ${DESTDIR} will be expanded @@ -164,21 +268,23 @@ _PROGLDOPTS= _PROGLDOPTS+= -Wl,-dynamic-linker=${_SHLINKER} .endif .if ${SHLIBDIR} != "/usr/lib" -_PROGLDOPTS+= -Wl,-rpath-link,${DESTDIR}${SHLIBDIR} \ - -R${SHLIBDIR} \ - -L${DESTDIR}${SHLIBDIR} +_PROGLDOPTS+= -Wl,-rpath,${SHLIBDIR} \ + -L=${SHLIBDIR} .elif ${SHLIBINSTALLDIR} != "/usr/lib" _PROGLDOPTS+= -Wl,-rpath-link,${DESTDIR}${SHLIBINSTALLDIR} \ - -L${DESTDIR}${SHLIBINSTALLDIR} + -L=${SHLIBINSTALLDIR} .endif -_PROGLDOPTS+= -Wl,-rpath-link,${DESTDIR}/usr/lib \ - -L${DESTDIR}/usr/lib __proginstall: .USE ${_MKTARGET_INSTALL} ${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${STRIPFLAG} ${.ALLSRC} ${.TARGET} +__progrumpinstall: .USE + ${_MKTARGET_INSTALL} + ${INSTALL_FILE} -o ${RUMPBINOWN} -g ${RUMPBINGRP} -m ${RUMPBINMODE} \ + ${STRIPFLAG} ${.ALLSRC} ${.TARGET} + __progdebuginstall: .USE ${_MKTARGET_INSTALL} ${INSTALL_FILE} -o ${DEBUGOWN} -g ${DEBUGGRP} -m ${DEBUGMODE} \ @@ -195,15 +301,34 @@ _APPEND_MANS=yes _APPEND_SRCS=yes _CCLINKFLAGS= -.if defined(DESTDIR) -_CCLINKFLAGS+= -B${_GCC_CRTDIR}/ -B${DESTDIR}/usr/lib/ -.endif .if defined(PROG_CXX) PROG= ${PROG_CXX} _CCLINK= ${CXX} ${_CCLINKFLAGS} .endif +.if defined(RUMPPRG) +PROG= ${RUMPPRG} +.ifndef CRUNCHEDPROG +PROGS= ${RUMPPRG} rump.${RUMPPRG} +. if defined(SRCS) +SRCS.rump.${PROG}:= ${SRCS} ${PROG}_rumpops.c ${RUMPSRCS} +SRCS+= ${PROG}_hostops.c +. else +SRCS= ${PROG}.c ${PROG}_hostops.c +SRCS.rump.${PROG}= ${PROG}.c ${PROG}_rumpops.c ${RUMPSRCS} +. endif +DPSRCS+= ${PROG}_rumpops.c ${RUMPSRCS} +LDADD.rump.${PROG}+= -lrumpclient +DPADD.rump.${PROG}+= ${LIBRUMPCLIENT} +MAN.rump.${PROG}= # defined but feeling empty +_RUMPINSTALL.rump.${PROG}=# defined +.else # CRUNCHEDPROG +PROGS= ${PROG} +CPPFLAGS+= -DCRUNCHOPS +.endif +.endif + .if defined(PROG) _CCLINK?= ${CC} ${_CCLINKFLAGS} . if defined(MAN) @@ -224,14 +349,14 @@ _APPEND_SRCS= no # Turn the single-program PROG and PROG_CXX variables into their multi-word # counterparts, PROGS and PROGS_CXX. -.if defined(PROG_CXX) && !defined(PROGS_CXX) +.if !defined(RUMPPRG) +. if defined(PROG_CXX) && !defined(PROGS_CXX) PROGS_CXX= ${PROG_CXX} -.elif defined(PROG) && !defined(PROGS) +. elif defined(PROG) && !defined(PROGS) PROGS= ${PROG} +. endif .endif - - # # Per-program definitions and targets. # @@ -292,10 +417,8 @@ ${_P}: .gdbinit ${LIBCRT0} ${OBJS.${_P}} .if !commands(${_P}) ${_MKTARGET_LINK} ${_CCLINK.${_P}} \ - ${DESTDIR:D-Wl,-nostdlib} \ ${_LDFLAGS.${_P}} ${_LDSTATIC.${_P}} -o ${.TARGET} \ ${OBJS.${_P}} ${_LDADD.${_P}} \ - ${DESTDIR:D-L${_GCC_LIBGCCDIR}} \ ${_PROGLDOPTS} .if defined(CTFMERGE) ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ${OBJS.${_P}} @@ -315,9 +438,10 @@ ${_P}.ro: ${OBJS.${_P}} ${DPADD} .if defined(_PROGDEBUG.${_P}) ${_PROGDEBUG.${_P}}: ${_P} ${_MKTARGET_CREATE} - ${OBJCOPY} --only-keep-debug ${_P} ${_PROGDEBUG.${_P}} - ${OBJCOPY} --strip-debug -R .gnu_debuglink --add-gnu-debuglink=${_PROGDEBUG.${_P}} ${_P} \ - || rm -f ${_PROGDEBUG.${_P}} + ( ${OBJCOPY} --only-keep-debug ${_P} ${_PROGDEBUG.${_P}} \ + && ${OBJCOPY} --strip-debug -p -R .gnu_debuglink \ + --add-gnu-debuglink=${_PROGDEBUG.${_P}} ${_P} \ + ) || (rm -f ${_PROGDEBUG.${_P}}; false) .endif .endif # defined(OBJS.${_P}) && !empty(OBJS.${_P}) # } @@ -331,14 +455,10 @@ MAN+= ${MAN.${_P}} realall: ${_P} ${_PROGDEBUG.${_P}} -cleanprog: cleanprog-${_P} -cleanprog-${_P}: - rm -f ${_P} ${_PROGDEBUG.${_P}} +CLEANFILES+= ${_P} ${_PROGDEBUG.${_P}} .if defined(OBJS.${_P}) && !empty(OBJS.${_P}) -cleanobjs: cleanobjs-${_P} -cleanobjs-${_P}: - rm -f ${OBJS.${_P}} ${LOBJS.${_P}} +CLEANFILES+= ${OBJS.${_P}} ${LOBJS.${_P}} .endif _PROG_INSTALL+= proginstall-${_P} @@ -350,7 +470,11 @@ proginstall-${_P}:: ${DESTDIR}${BINDIR.$ ${_PROGDEBUG.${_P}:D${DESTDIR}${DEBUGDIR}${BINDIR.${_P}}/${_PROGDEBUG.${_P}}} .if ${MKUPDATE} == "no" +.if defined(_RUMPINSTALL.${_P}) +${DESTDIR}${BINDIR.${_P}}/${PROGNAME.${_P}}! ${_P} __progrumpinstall +.else ${DESTDIR}${BINDIR.${_P}}/${PROGNAME.${_P}}! ${_P} __proginstall +.endif .if !defined(BUILD) && !make(all) && !make(${_P}) ${DESTDIR}${BINDIR.${_P}}/${PROGNAME.${_P}}! .MADE .endif @@ -361,7 +485,11 @@ ${DESTDIR}${DEBUGDIR}${BINDIR.${_P}}/${_ .endif .endif # define(_PROGDEBUG.${_P}) .else # MKUPDATE != no +.if defined(_RUMPINSTALL.${_P}) +${DESTDIR}${BINDIR.${_P}}/${PROGNAME.${_P}}: ${_P} __progrumpinstall +.else ${DESTDIR}${BINDIR.${_P}}/${PROGNAME.${_P}}: ${_P} __proginstall +.endif .if !defined(BUILD) && !make(all) && !make(${_P}) ${DESTDIR}${BINDIR.${_P}}/${PROGNAME.${_P}}: .MADE .endif @@ -385,9 +513,7 @@ lint-${_P}: ${LOBJS.${_P}} .if defined(OBJS) && !empty(OBJS) && \ (empty(PROGS) && empty(PROGS_CXX)) -cleanobjs: cleanobjs-plain -cleanobjs-plain: - rm -f ${OBJS} ${LOBJS} +CLEANFILES+= ${OBJS} ${LOBJS} .endif .if !target(proginstall) @@ -446,11 +572,8 @@ LINKSMODE?= ${BINMODE} .include .include .include - -cleanextra: .PHONY -.if defined(CLEANFILES) && !empty(CLEANFILES) - rm -f ${CLEANFILES} -.endif +.include +.include ${TARGETS}: # ensure existence