[BACK]Return to bsd.lib.mk CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / share / mk

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/share/mk/bsd.lib.mk between version 1.227 and 1.228

version 1.227, 2003/07/28 02:29:35 version 1.228, 2003/07/28 04:08:47
Line 126  CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS}
Line 126  CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS}
 APICFLAGS?= -k  APICFLAGS?= -k
 # XXX libraries often need the millicode functions in libgcc.a,  # XXX libraries often need the millicode functions in libgcc.a,
 # so we have to work around the -nostdlib:  # so we have to work around the -nostdlib:
 LDADD+= `$(CC) -print-libgcc-file-name`  LDADD+= `${CC} -print-libgcc-file-name`
   
 .else  .else
   
Line 163  CFLAGS+= ${COPTS}
Line 163  CFLAGS+= ${COPTS}
 FFLAGS+=        ${FOPTS}  FFLAGS+=        ${FOPTS}
   
 .c.o:  .c.o:
           ${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}.tmp
 .if defined(COPTS) && !empty(COPTS:M*-g*)  .if defined(COPTS) && !empty(COPTS:M*-g*)
         ${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC}          mv ${.TARGET}.tmp ${.TARGET}
 .else  .else
         @echo ${COMPILE.c:Q} ${COPTS.${.IMPSRC:T}:Q} ${CPUFLAGS.${.IMPSRC:T}:Q} ${CPPFLAGS.${.IMPSRC:T}:Q} ${.IMPSRC}          ${LD} -x -r ${.TARGET}.tmp -o ${.TARGET}
         @${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}.o          rm -f ${.TARGET}.tmp
         @${LD} -x -r ${.TARGET}.o -o ${.TARGET}  
         @rm -f ${.TARGET}.o  
 .endif  .endif
   
 .c.po:  .c.po:
           ${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -pg ${.IMPSRC} -o ${.TARGET}.tmp
 .if defined(COPTS) && !empty(COPTS:M*-g*)  .if defined(COPTS) && !empty(COPTS:M*-g*)
         ${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -pg ${.IMPSRC} -o ${.TARGET}          mv ${.TARGET}.tmp ${.TARGET}
 .else  .else
         @echo ${COMPILE.c:Q} ${COPTS.${.IMPSRC:T}:Q} ${CPUFLAGS.${.IMPSRC:T}:Q} ${CPPFLAGS.${.IMPSRC:T}:Q} -pg ${.IMPSRC} -o ${.TARGET}          ${LD} -X -r ${.TARGET}.tmp -o ${.TARGET}
         @${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -pg ${.IMPSRC} -o ${.TARGET}.o          rm -f ${.TARGET}.tmp
         @${LD} -X -r ${.TARGET}.o -o ${.TARGET}  
         @rm -f ${.TARGET}.o  
 .endif  .endif
   
 .c.so:  .c.so:
           ${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}.tmp
 .if defined(COPTS) && !empty(COPTS:M*-g*)  .if defined(COPTS) && !empty(COPTS:M*-g*)
         ${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}          mv ${.TARGET}.tmp ${.TARGET}
 .else  .else
         @echo ${COMPILE.c:Q} ${COPTS.${.IMPSRC:T}:Q} ${CPUFLAGS.${.IMPSRC:T}:Q} ${CPPFLAGS.${.IMPSRC:T}:Q} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}          ${LD} -x -r ${.TARGET}.tmp -o ${.TARGET}
         @${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}.o          rm -f ${.TARGET}.tmp
         @${LD} -x -r ${.TARGET}.o -o ${.TARGET}  
         @rm -f ${.TARGET}.o  
 .endif  .endif
   
 .c.ln:  .c.ln:
         ${LINT} ${LINTFLAGS} ${CPPFLAGS:M-[IDU]*} ${CPPFLAGS.${.IMPSRC:T}:M-[-IDU]*} -i ${.IMPSRC}          ${LINT} ${LINTFLAGS} ${CPPFLAGS:M-[IDU]*} ${CPPFLAGS.${.IMPSRC:T}:M-[-IDU]*} -i ${.IMPSRC}
   
 .cc.o .cpp.o .cxx.o .C.o:  .cc.o .cpp.o .cxx.o .C.o:
           ${COMPILE.cc} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}.tmp
 .if defined(COPTS) && !empty(COPTS:M*-g*)  .if defined(COPTS) && !empty(COPTS:M*-g*)
         ${COMPILE.cc} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC}          mv ${.TARGET}.tmp ${.TARGET}
 .else  .else
         @echo ${COMPILE.cc:Q} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC}          ${LD} -x -r ${.TARGET}.tmp -o ${.TARGET}
         @${COMPILE.cc} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}.o          rm -f ${.TARGET}.tmp
         @${LD} -x -r ${.TARGET}.o -o ${.TARGET}  
         @rm -f ${.TARGET}.o  
 .endif  .endif
   
 .cc.po .cpp.po .cxx.o .C.po:  .cc.po .cpp.po .cxx.o .C.po:
           ${COMPILE.cc} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -pg ${.IMPSRC} -o ${.TARGET}.tmp
 .if defined(COPTS) && !empty(COPTS:M*-g*)  .if defined(COPTS) && !empty(COPTS:M*-g*)
         ${COMPILE.cc} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -pg ${.IMPSRC} -o ${.TARGET}          mv ${.TARGET}.tmp ${.TARGET}
 .else  .else
         @echo ${COMPILE.cc:Q} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -pg ${.IMPSRC} -o ${.TARGET}          ${LD} -X -r ${.TARGET}.tmp -o ${.TARGET}
         @${COMPILE.cc} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -pg ${.IMPSRC} -o ${.TARGET}.o          rm -f ${.TARGET}.tmp
         @${LD} -X -r ${.TARGET}.o -o ${.TARGET}  
         @rm -f ${.TARGET}.o  
 .endif  .endif
   
 .cc.so .cpp.so .cxx.so .C.so:  .cc.so .cpp.so .cxx.so .C.so:
           ${COMPILE.cc} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}.tmp
 .if defined(COPTS) && !empty(COPTS:M*-g*)  .if defined(COPTS) && !empty(COPTS:M*-g*)
         ${COMPILE.cc} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}          mv ${.TARGET}.tmp ${.TARGET}
 .else  .else
         @echo ${COMPILE.cc:Q} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}          ${LD} -x -r ${.TARGET}.tmp -o ${.TARGET}
         @${COMPILE.cc} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}.o          rm -f ${.TARGET}.tmp
         @${LD} -x -r ${.TARGET}.o -o ${.TARGET}  
         @rm -f ${.TARGET}.o  
 .endif  .endif
   
 .f.o:  .f.o:
           ${COMPILE.f} ${.IMPSRC} -o ${.TARGET}.tmp
 .if defined(FOPTS) && !empty(FOPTS:M*-g*)  .if defined(FOPTS) && !empty(FOPTS:M*-g*)
         ${COMPILE.f} ${.IMPSRC}          mv ${.TARGET}.tmp ${.TARGET}
 .else  .else
         @echo ${COMPILE.f:Q} ${.IMPSRC}          ${LD} -x -r ${.TARGET}.tmp -o ${.TARGET}
         @${COMPILE.f} ${.IMPSRC} -o ${.TARGET}.o          rm -f ${.TARGET}.tmp
         @${LD} -x -r ${.TARGET}.o -o ${.TARGET}  
         @rm -f ${.TARGET}.o  
 .endif  .endif
   
 .f.po:  .f.po:
           ${COMPILE.f} -pg ${.IMPSRC} -o ${.TARGET}.tmp
 .if defined(FOPTS) && !empty(FOPTS:M*-g*)  .if defined(FOPTS) && !empty(FOPTS:M*-g*)
         ${COMPILE.f} -pg ${.IMPSRC} -o ${.TARGET}          mv ${.TARGET}.tmp ${.TARGET}
 .else  .else
         @echo ${COMPILE.f:Q} -pg ${.IMPSRC} -o ${.TARGET}          ${LD} -X -r ${.TARGET}.tmp -o ${.TARGET}
         @${COMPILE.f} -pg ${.IMPSRC} -o ${.TARGET}.o          rm -f ${.TARGET}.tmp
         @${LD} -X -r ${.TARGET}.o -o ${.TARGET}  
         @rm -f ${.TARGET}.o  
 .endif  .endif
   
 .f.so:  .f.so:
           ${COMPILE.f} ${FPICFLAGS} ${.IMPSRC} -o ${.TARGET}.tmp
 .if defined(FOPTS) && !empty(FOPTS:M*-g*)  .if defined(FOPTS) && !empty(FOPTS:M*-g*)
         ${COMPILE.f} ${FPICFLAGS} ${.IMPSRC} -o ${.TARGET}          mv ${.TARGET}.tmp ${.TARGET}
 .else  .else
         @echo ${COMPILE.f:Q} ${FPICFLAGS} ${.IMPSRC} -o ${.TARGET}          ${LD} -x -r ${.TARGET}.tmp -o ${.TARGET}
         @${COMPILE.f} ${FPICFLAGS} ${.IMPSRC} -o ${.TARGET}.o          rm -f ${.TARGET}.tmp
         @${LD} -x -r ${.TARGET}.o -o ${.TARGET}  
         @rm -f ${.TARGET}.o  
 .endif  .endif
   
 .f.ln:  .f.ln:
         @echo Skipping lint for Fortran libraries.          @echo Skipping lint for Fortran libraries.
   
 .m.o:  .m.o:
           ${COMPILE.m} ${.IMPSRC} -o ${.TARGET}.tmp
 .if defined(OBJCFLAGS) && !empty(OBJCFLAGS:M*-g*)  .if defined(OBJCFLAGS) && !empty(OBJCFLAGS:M*-g*)
         ${COMPILE.m} ${.IMPSRC}          mv ${.TARGET}.tmp ${.TARGET}
 .else  .else
         @echo ${COMPILE.m:Q} ${.IMPSRC}          ${LD} -x -r ${.TARGET}.tmp -o ${.TARGET}
         @${COMPILE.m} ${.IMPSRC} -o ${.TARGET}.o          rm -f ${.TARGET}.tmp
         @${LD} -x -r ${.TARGET}.o -o ${.TARGET}  
         @rm -f ${.TARGET}.o  
 .endif  .endif
   
 .m.po:  .m.po:
           ${COMPILE.m} -pg ${.IMPSRC} -o ${.TARGET}.tmp
 .if defined(OBJCFLAGS) && !empty(OBJCFLAGS:M*-g*)  .if defined(OBJCFLAGS) && !empty(OBJCFLAGS:M*-g*)
         ${COMPILE.m} -pg ${.IMPSRC} -o ${.TARGET}          mv ${.TARGET}.tmp ${.TARGET}
 .else  .else
         @echo ${COMPILE.m:Q} -pg ${.IMPSRC} -o ${.TARGET}          ${LD} -X -r ${.TARGET}.tmp -o ${.TARGET}
         @${COMPILE.m} -pg ${.IMPSRC} -o ${.TARGET}.o          rm -f ${.TARGET}.tmp
         @${LD} -X -r ${.TARGET}.o -o ${.TARGET}  
         @rm -f ${.TARGET}.o  
 .endif  .endif
   
 .m.so:  .m.so:
           ${COMPILE.m} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}.tmp
 .if defined(OBJCFLAGS) && !empty(OBJCFLAGS:M*-g*)  .if defined(OBJCFLAGS) && !empty(OBJCFLAGS:M*-g*)
         ${COMPILE.m} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}          mv ${.TARGET}.tmp ${.TARGET}
 .else  .else
         @echo ${COMPILE.m:Q} ${CPICFLAGS} ${.IMPSRC} -o ${.TARGET}          ${LD} -x -r ${.TARGET}.tmp -o ${.TARGET}
         @${COMPILE.m} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}.o          rm -f ${.TARGET}.tmp
         @${LD} -x -r ${.TARGET}.o -o ${.TARGET}  
         @rm -f ${.TARGET}.o  
 .endif  .endif
   
 .S.o .s.o:  .S.o .s.o:
         @echo ${COMPILE.S:Q} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC}          ${COMPILE.S} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}.tmp
         @${COMPILE.S} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}.o          ${LD} -x -r ${.TARGET}.tmp -o ${.TARGET}
         @${LD} -x -r ${.TARGET}.o -o ${.TARGET}          rm -f ${.TARGET}.tmp
         @rm -f ${.TARGET}.o  
   
 .S.po .s.po:  .S.po .s.po:
         @echo ${COMPILE.S:Q} -DGPROF -DPROF ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}          ${COMPILE.S} -DGPROF -DPROF ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}.tmp
         @${COMPILE.S} -DGPROF -DPROF ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}.o          ${LD} -X -r ${.TARGET}.tmp -o ${.TARGET}
         @${LD} -X -r ${.TARGET}.o -o ${.TARGET}          rm -f ${.TARGET}.tmp
         @rm -f ${.TARGET}.o  
   
 .S.so .s.so:  .S.so .s.so:
         @echo ${COMPILE.S:Q} ${CAPICFLAGS} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}          ${COMPILE.S} ${CAPICFLAGS} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}.tmp
         @${COMPILE.S} ${CAPICFLAGS} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}.o          ${LD} -x -r ${.TARGET}.tmp -o ${.TARGET}
         @${LD} -x -r ${.TARGET}.o -o ${.TARGET}          rm -f ${.TARGET}.tmp
         @rm -f ${.TARGET}.o  
   
 .if defined(LIB)  .if defined(LIB)
 .if ${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \  .if ${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \
Line 367  realall: ${SRCS} ${ALLOBJS:O} ${_LIBS}
Line 352  realall: ${SRCS} ${ALLOBJS:O} ${_LIBS}
   
 __archivebuild: .USE  __archivebuild: .USE
         @rm -f ${.TARGET}          @rm -f ${.TARGET}
         @${AR} cq ${.TARGET} `NM=${NM} ${LORDER} ${.ALLSRC:M*o} | ${TSORT}`          ${AR} cq ${.TARGET} `NM=${NM} ${LORDER} ${.ALLSRC:M*o} | ${TSORT}`
         ${RANLIB} ${.TARGET}          ${RANLIB} ${.TARGET}
   
 __archiveinstall: .USE  __archiveinstall: .USE
Line 394  lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOL
Line 379  lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOL
         @echo building shared ${LIB} library \(version ${SHLIB_FULLVERSION}\)          @echo building shared ${LIB} library \(version ${SHLIB_FULLVERSION}\)
         @rm -f lib${LIB}.so.${SHLIB_FULLVERSION}          @rm -f lib${LIB}.so.${SHLIB_FULLVERSION}
 .if defined(DESTDIR)  .if defined(DESTDIR)
         $(CC) -Wl,-nostdlib -B${_GCC_CRTDIR}/ -B${DESTDIR}/usr/lib/ \          ${CC} -Wl,-nostdlib -B${_GCC_CRTDIR}/ -B${DESTDIR}/usr/lib/ \
             -Wl,-x -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \              -Wl,-x -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \
             -Wl,--whole-archive ${SOLIB} \              -Wl,--whole-archive ${SOLIB} \
             -Wl,--no-whole-archive ${LDADD} \              -Wl,--no-whole-archive ${LDADD} \
             -L${_GCC_LIBGCCDIR} -L${DESTDIR}${_LIBSODIR} -L${DESTDIR}${LIBDIR} \              -L${_GCC_LIBGCCDIR} -L${DESTDIR}${_LIBSODIR} -L${DESTDIR}${LIBDIR} \
             -R${_LIBSODIR} -R${LIBDIR}              -R${_LIBSODIR} -R${LIBDIR}
 .else  .else
         $(CC) -Wl,-x -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \          ${CC} -Wl,-x -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \
             -Wl,--whole-archive ${SOLIB} -Wl,--no-whole-archive ${LDADD}              -Wl,--whole-archive ${SOLIB} -Wl,--no-whole-archive ${LDADD}
 .endif  .endif
 .if ${OBJECT_FMT} == "ELF"  .if ${OBJECT_FMT} == "ELF"
Line 420  llib-l${LIB}.ln: ${LOBJS}
Line 405  llib-l${LIB}.ln: ${LOBJS}
         @echo building llib-l${LIB}.ln          @echo building llib-l${LIB}.ln
         @rm -f llib-l${LIB}.ln          @rm -f llib-l${LIB}.ln
 .if defined(DESTDIR)  .if defined(DESTDIR)
         @${LINT} -C${LIB} ${.ALLSRC} -L${DESTDIR}/usr/libdata ${LLIBS}          ${LINT} -C${LIB} ${.ALLSRC} -L${DESTDIR}/usr/libdata ${LLIBS}
 .else  .else
         @${LINT} -C${LIB} ${.ALLSRC} ${LLIBS}          ${LINT} -C${LIB} ${.ALLSRC} ${LLIBS}
 .endif  .endif
 .endif  .endif
   
Line 431  cleanlib:
Line 416  cleanlib:
         rm -f lib${LIB}.a ${OBJS}          rm -f lib${LIB}.a ${OBJS}
         rm -f lib${LIB}_p.a ${POBJS}          rm -f lib${LIB}_p.a ${POBJS}
         rm -f lib${LIB}_pic.a lib${LIB}.so.* lib${LIB}.so ${SOBJS}          rm -f lib${LIB}_pic.a lib${LIB}.so.* lib${LIB}.so ${SOBJS}
           rm -f ${OBJS:=.tmp} ${POBJS:=.tmp} ${SOBJS:=.tmp}
         rm -f llib-l${LIB}.ln ${LOBJS}          rm -f llib-l${LIB}.ln ${LOBJS}
   
 .if defined(SRCS)  .if defined(SRCS)

Legend:
Removed from v.1.227  
changed lines
  Added in v.1.228

CVSweb <webmaster@jp.NetBSD.org>