[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.289.2.1 and 1.305

version 1.289.2.1, 2008/12/01 00:36:29 version 1.305, 2010/03/02 20:49:18
Line 9 
Line 9 
   
 LIBISMODULE?=   no  LIBISMODULE?=   no
 LIBISPRIVATE?=  no  LIBISPRIVATE?=  no
   LIBISCXX?=      no
   
 _LIB_PREFIX=    lib  _LIB_PREFIX=    lib
   
Line 46  clean:  cleanlib
Line 47  clean:  cleanlib
 CFLAGS+=        ${PIE_CFLAGS}  CFLAGS+=        ${PIE_CFLAGS}
 AFLAGS+=        ${PIE_AFLAGS}  AFLAGS+=        ${PIE_AFLAGS}
 .endif  .endif
 COPTS+=     ${COPTS.lib${LIB}}  
 CPPFLAGS+=  ${CPPFLAGS.lib${LIB}}  
 CXXFLAGS+=  ${CXXFLAGS.lib${LIB}}  
 OBJCOPTS+=  ${OBJCOPTS.lib${LIB}}  
 LDADD+=     ${LDADD.lib${LIB}}  
 LDFLAGS+=   ${LDFLAGS.lib${LIB}}  
 LDSTATIC+=  ${LDSTATIC.lib${LIB}}  
   
 ##### Libraries that this may depend upon.  ##### Libraries that this may depend upon.
 .if defined(LIBDPLIBS) && ${MKPIC} != "no"                              # {  .if defined(LIBDPLIBS) && ${MKPIC} != "no"                              # {
 .for _lib _dir in ${LIBDPLIBS}  .for _lib _dir in ${LIBDPLIBS}
 .if !defined(LIBDO.${_lib})  .if !defined(LIBDO.${_lib})
 LIBDO.${_lib}!= cd ${_dir} && ${PRINTOBJDIR}  LIBDO.${_lib}!= cd "${_dir}" && ${PRINTOBJDIR}
 .MAKEOVERRIDES+=LIBDO.${_lib}  .MAKEOVERRIDES+=LIBDO.${_lib}
 .endif  .endif
 LDADD+=         -L${LIBDO.${_lib}} -l${_lib}  LDADD+=         -L${LIBDO.${_lib}} -l${_lib}
Line 67  DPADD+=  ${LIBDO.${_lib}}/lib${_lib}.so
Line 61  DPADD+=  ${LIBDO.${_lib}}/lib${_lib}.so
 .endif                                                                  # }  .endif                                                                  # }
   
 ##### Build and install rules  ##### Build and install rules
 MKDEP_SUFFIXES?=        .o .po .so .go .ln  MKDEP_SUFFIXES?=        .o .po .pico .go .ln
   
   # Use purely kernel private headers in rump builds
   .if !defined(RUMPKERNEL)
   .if empty(CPPFLAGS:M-nostdinc)
 CPPFLAGS+=      ${DESTDIR:D-nostdinc ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include}  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++}  CXXFLAGS+=      ${DESTDIR:D-nostdinc++ ${CPPFLAG_ISYSTEMXX} ${DESTDIR}/usr/include/g++}
   .endif
   .endif
   
 .if !defined(SHLIB_MAJOR) && exists(${SHLIB_VERSION_FILE})              # {  .if !defined(SHLIB_MAJOR) && exists(${SHLIB_VERSION_FILE})              # {
 SHLIB_MAJOR != . ${SHLIB_VERSION_FILE} ; echo $$major  SHLIB_MAJOR != . ${SHLIB_VERSION_FILE} ; echo $$major
 SHLIB_MINOR != . ${SHLIB_VERSION_FILE} ; echo $$minor  SHLIB_MINOR != . ${SHLIB_VERSION_FILE} ; echo $$minor
 SHLIB_TEENY != . ${SHLIB_VERSION_FILE} ; echo $$teeny  SHLIB_TEENY != . ${SHLIB_VERSION_FILE} ; echo $$teeny
   
   DPADD+= ${SHLIB_VERSION_FILE}
   
 # Check for higher installed library versions.  # Check for higher installed library versions.
 .if !defined(NOCHECKVER) && !defined(NOCHECKVER_${LIB}) && \  .if !defined(NOCHECKVER) && !defined(NOCHECKVER_${LIB}) && \
         exists(${NETBSDSRCDIR}/lib/checkver)          exists(${NETBSDSRCDIR}/lib/checkver)
 checkver:  checkver:
         @(cd ${.CURDIR} && \          @(cd "${.CURDIR}" && \
             HOST_SH=${HOST_SH:Q} AWK=${TOOL_AWK:Q} \              HOST_SH=${HOST_SH:Q} AWK=${TOOL_AWK:Q} \
             ${HOST_SH} ${NETBSDSRCDIR}/lib/checkver -v ${SHLIB_VERSION_FILE} \              ${HOST_SH} ${NETBSDSRCDIR}/lib/checkver -v ${SHLIB_VERSION_FILE} \
                     -d ${DESTDIR}${_LIBSODIR} ${LIB})                      -d ${DESTDIR}${_LIBSODIR} ${LIB})
Line 126  SHLIB_FULLVERSION=${SHLIB_MAJOR}
Line 130  SHLIB_FULLVERSION=${SHLIB_MAJOR}
   
 # add additional suffixes not exported.  # add additional suffixes not exported.
 # .po is used for profiling object files.  # .po is used for profiling object files.
 # .so is used for PIC object files.  # .pico is used for PIC object files.
 .SUFFIXES: .out .a .ln .so .po .go .o .s .S .c .cc .cpp .cxx .C .m .F .f .r .y .l .cl .p .h  .SUFFIXES: .out .a .ln .pico .po .go .o .s .S .c .cc .cpp .cxx .C .m .F .f .r .y .l .cl .p .h
 .SUFFIXES: .sh .m4 .m  .SUFFIXES: .sh .m4 .m
   
   
Line 137  SHLIB_FULLVERSION=${SHLIB_MAJOR}
Line 141  SHLIB_FULLVERSION=${SHLIB_MAJOR}
 # Data-driven table using make variables to control how shared libraries  # Data-driven table using make variables to control how shared libraries
 # are built for different platforms and object formats.  # are built for different platforms and object formats.
 # OBJECT_FMT:           currently either "ELF" or "a.out", from <bsd.own.mk>  # OBJECT_FMT:           currently either "ELF" or "a.out", from <bsd.own.mk>
   # SHLIB_MAJOR, SHLIB_MINOR, SHLIB_TEENY: Major, minor, and teeny version
   #                       numbers of shared library
 # SHLIB_SOVERSION:      version number to be compiled into a shared library  # SHLIB_SOVERSION:      version number to be compiled into a shared library
 #                       via -soname. Usualy ${SHLIB_MAJOR} on ELF.  #                       via -soname. Usualy ${SHLIB_MAJOR} on ELF.
 #                       NetBSD/pmax used to use ${SHLIB_MAJOR}[.${SHLIB_MINOR}  #                       NetBSD/pmax used to use ${SHLIB_MAJOR}[.${SHLIB_MINOR}
Line 145  SHLIB_FULLVERSION=${SHLIB_MAJOR}
Line 151  SHLIB_FULLVERSION=${SHLIB_MAJOR}
 #                       with ELF, also set shared-lib version for ld.so.  #                       with ELF, also set shared-lib version for ld.so.
 # SHLIB_LDSTARTFILE:    support .o file, call C++ file-level constructors  # SHLIB_LDSTARTFILE:    support .o file, call C++ file-level constructors
 # SHLIB_LDENDFILE:      support .o file, call C++ file-level destructors  # SHLIB_LDENDFILE:      support .o file, call C++ file-level destructors
 # FPICFLAGS:            flags for ${FC} to compile .[fF] files to .so objects.  # FPICFLAGS:            flags for ${FC} to compile .[fF] files to .pico objects.
 # CPPPICFLAGS:          flags for ${CPP} to preprocess .[sS] files for ${AS}  # CPPPICFLAGS:          flags for ${CPP} to preprocess .[sS] files for ${AS}
 # CPICFLAGS:            flags for ${CC} to compile .[cC] files to pic objects.  # CPICFLAGS:            flags for ${CC} to compile .[cC] files to pic objects.
 # CSHLIBFLAGS:          flags for ${CC} to compile .[cC] files to .so objects.  # CSHLIBFLAGS:          flags for ${CC} to compile .[cC] files to .pico objects.
 #                       (usually includes ${CPICFLAGS})  #                       (usually includes ${CPICFLAGS})
 # CAPICFLAGS:           flags for ${CC} to compiling .[Ss] files  # CAPICFLAGS:           flags for ${CC} to compiling .[Ss] files
 #                       (usually just ${CPPPICFLAGS} ${CPICFLAGS})  #                       (usually just ${CPPPICFLAGS} ${CPICFLAGS})
 # APICFLAGS:            flags for ${AS} to assemble .[sS] to .so objects.  # APICFLAGS:            flags for ${AS} to assemble .[sS] to .pico objects.
   
 .if ${MACHINE_ARCH} == "alpha"                                          # {  .if ${MACHINE_ARCH} == "alpha"                                          # {
   
Line 201  MKSHLIBOBJS= no
Line 207  MKSHLIBOBJS= no
 SHLIB_SOVERSION=        ${SHLIB_MAJOR}  SHLIB_SOVERSION=        ${SHLIB_MAJOR}
 SHLIB_SHFLAGS=          -Wl,-soname,${_LIB_PREFIX}${LIB}.so.${SHLIB_SOVERSION}  SHLIB_SHFLAGS=          -Wl,-soname,${_LIB_PREFIX}${LIB}.so.${SHLIB_SOVERSION}
 SHLIB_SHFLAGS+=         -Wl,--warn-shared-textrel  SHLIB_SHFLAGS+=         -Wl,--warn-shared-textrel
 SHLIB_LDSTARTFILE?=     ${DESTDIR}/usr/lib/crti.o ${_GCC_CRTBEGINS}  SHLIB_LDSTARTFILE?=     ${_GCC_CRTDIR}/crti.o ${_GCC_CRTBEGINS}
 SHLIB_LDENDFILE?=       ${_GCC_CRTENDS} ${DESTDIR}/usr/lib/crtn.o  SHLIB_LDENDFILE?=       ${_GCC_CRTENDS} ${_GCC_CRTDIR}/crtn.o
 .endif  .endif
   
 CFLAGS+=        ${COPTS}  CFLAGS+=        ${COPTS}
Line 210  OBJCFLAGS+= ${OBJCOPTS}
Line 216  OBJCFLAGS+= ${OBJCOPTS}
 AFLAGS+=        ${COPTS}  AFLAGS+=        ${COPTS}
 FFLAGS+=        ${FOPTS}  FFLAGS+=        ${FOPTS}
   
   .if defined(CTFCONVERT)
   .if defined(CFLAGS) && !empty(CFLAGS:M*-g*)
   CTFFLAGS+=      -g
   .endif
   .endif
   
 .c.o:  .c.o:
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
         ${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}          ${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
   .if defined(CTFCONVERT)
           ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
   .endif
 .if !defined(CFLAGS) || empty(CFLAGS:M*-g*)  .if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
         ${OBJCOPY} -x ${.TARGET}          ${OBJCOPY} -x ${.TARGET}
 .endif  .endif
Line 220  FFLAGS+= ${FOPTS}
Line 235  FFLAGS+= ${FOPTS}
 .c.po:  .c.po:
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
         ${COMPILE.c} ${PROFFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -pg ${.IMPSRC} -o ${.TARGET}          ${COMPILE.c} ${PROFFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -pg ${.IMPSRC} -o ${.TARGET}
   .if defined(CTFCONVERT)
           ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
   .endif
 .if !defined(CFLAGS) || empty(CFLAGS:M*-g*)  .if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
         ${OBJCOPY} -X ${.TARGET}          ${OBJCOPY} -X ${.TARGET}
 .endif  .endif
Line 228  FFLAGS+= ${FOPTS}
Line 246  FFLAGS+= ${FOPTS}
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
         ${COMPILE.c} ${DEBUGFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -g ${.IMPSRC} -o ${.TARGET}          ${COMPILE.c} ${DEBUGFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -g ${.IMPSRC} -o ${.TARGET}
   
 .c.so:  .c.pico:
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
         ${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}          ${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}
 .if !defined(CFLAGS) || empty(CFLAGS:M*-g*)  .if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
Line 253  FFLAGS+= ${FOPTS}
Line 271  FFLAGS+= ${FOPTS}
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
         ${COMPILE.cc} ${DEBUGFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -g ${.IMPSRC} -o ${.TARGET}          ${COMPILE.cc} ${DEBUGFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -g ${.IMPSRC} -o ${.TARGET}
   
 .cc.so .cpp.so .cxx.so .C.so:  .cc.pico .cpp.pico .cxx.pico .C.pico:
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
         ${COMPILE.cc} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}          ${COMPILE.cc} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}
 .if !defined(CFLAGS) || empty(CFLAGS:M*-g*)  .if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
Line 263  FFLAGS+= ${FOPTS}
Line 281  FFLAGS+= ${FOPTS}
 .f.o:  .f.o:
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
         ${COMPILE.f} ${.IMPSRC} -o ${.TARGET}          ${COMPILE.f} ${.IMPSRC} -o ${.TARGET}
   .if defined(CTFCONVERT)
           ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
   .endif
 .if !defined(FOPTS) || empty(FOPTS:M*-g*)  .if !defined(FOPTS) || empty(FOPTS:M*-g*)
         ${OBJCOPY} -x ${.TARGET}          ${OBJCOPY} -x ${.TARGET}
 .endif  .endif
Line 270  FFLAGS+= ${FOPTS}
Line 291  FFLAGS+= ${FOPTS}
 .f.po:  .f.po:
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
         ${COMPILE.f} ${PROFFLAGS} -pg ${.IMPSRC} -o ${.TARGET}          ${COMPILE.f} ${PROFFLAGS} -pg ${.IMPSRC} -o ${.TARGET}
   .if defined(CTFCONVERT)
           ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
   .endif
 .if !defined(FOPTS) || empty(FOPTS:M*-g*)  .if !defined(FOPTS) || empty(FOPTS:M*-g*)
         ${OBJCOPY} -X ${.TARGET}          ${OBJCOPY} -X ${.TARGET}
 .endif  .endif
Line 278  FFLAGS+= ${FOPTS}
Line 302  FFLAGS+= ${FOPTS}
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
         ${COMPILE.f} ${DEBUGFLAGS} -g ${.IMPSRC} -o ${.TARGET}          ${COMPILE.f} ${DEBUGFLAGS} -g ${.IMPSRC} -o ${.TARGET}
   
 .f.so:  .f.pico:
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
         ${COMPILE.f} ${FPICFLAGS} ${.IMPSRC} -o ${.TARGET}          ${COMPILE.f} ${FPICFLAGS} ${.IMPSRC} -o ${.TARGET}
 .if !defined(FOPTS) || empty(FOPTS:M*-g*)  .if !defined(FOPTS) || empty(FOPTS:M*-g*)
Line 292  FFLAGS+= ${FOPTS}
Line 316  FFLAGS+= ${FOPTS}
 .m.o:  .m.o:
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
         ${COMPILE.m} ${OBJCOPTS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}          ${COMPILE.m} ${OBJCOPTS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
   .if defined(CTFCONVERT)
           ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
   .endif
 .if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*)  .if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*)
         ${OBJCOPY} -x ${.TARGET}          ${OBJCOPY} -x ${.TARGET}
 .endif  .endif
Line 299  FFLAGS+= ${FOPTS}
Line 326  FFLAGS+= ${FOPTS}
 .m.po:  .m.po:
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
         ${COMPILE.m} ${PROFFLAGS} -pg ${OBJCOPTS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}          ${COMPILE.m} ${PROFFLAGS} -pg ${OBJCOPTS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
   .if defined(CTFCONVERT)
           ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
   .endif
 .if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*)  .if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*)
         ${OBJCOPY} -X ${.TARGET}          ${OBJCOPY} -X ${.TARGET}
 .endif  .endif
Line 310  FFLAGS+= ${FOPTS}
Line 340  FFLAGS+= ${FOPTS}
         ${OBJCOPY} -X ${.TARGET}          ${OBJCOPY} -X ${.TARGET}
 .endif  .endif
   
 .m.so:  .m.pico:
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
         ${COMPILE.m} ${CSHLIBFLAGS} ${OBJCOPTS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}          ${COMPILE.m} ${CSHLIBFLAGS} ${OBJCOPTS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
 .if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*)  .if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*)
Line 320  FFLAGS+= ${FOPTS}
Line 350  FFLAGS+= ${FOPTS}
 .s.o:  .s.o:
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
         ${COMPILE.s} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}          ${COMPILE.s} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
   .if defined(CTFCONVERT)
           ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
   .endif
         ${OBJCOPY} -x ${.TARGET}          ${OBJCOPY} -x ${.TARGET}
   
 .S.o:  .S.o:
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
         ${COMPILE.S} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}          ${COMPILE.S} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
   .if defined(CTFCONVERT)
           ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
   .endif
         ${OBJCOPY} -x ${.TARGET}          ${OBJCOPY} -x ${.TARGET}
   
 .s.po:  .s.po:
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
         ${COMPILE.s} ${PROFFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}          ${COMPILE.s} ${PROFFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
   .if defined(CTFCONVERT)
           ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
   .endif
         ${OBJCOPY} -X ${.TARGET}          ${OBJCOPY} -X ${.TARGET}
   
 .S.po:  .S.po:
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
         ${COMPILE.S} ${PROFFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}          ${COMPILE.S} ${PROFFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
   .if defined(CTFCONVERT)
           ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
   .endif
         ${OBJCOPY} -X ${.TARGET}          ${OBJCOPY} -X ${.TARGET}
   
 .s.go:  .s.go:
Line 345  FFLAGS+= ${FOPTS}
Line 387  FFLAGS+= ${FOPTS}
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
         ${COMPILE.S} ${DEBUGFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}          ${COMPILE.S} ${DEBUGFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
   
 .s.so:  .s.pico:
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
         ${COMPILE.s} ${CAPICFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}          ${COMPILE.s} ${CAPICFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
         ${OBJCOPY} -x ${.TARGET}          ${OBJCOPY} -x ${.TARGET}
   
 .S.so:  .S.pico:
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
         ${COMPILE.S} ${CAPICFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}          ${COMPILE.S} ${CAPICFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
         ${OBJCOPY} -x ${.TARGET}          ${OBJCOPY} -x ${.TARGET}
Line 393  PROFFLAGS?=-DGPROF -DPROF
Line 435  PROFFLAGS?=-DGPROF -DPROF
 # since it's needed for making shared lib.  # since it's needed for making shared lib.
 # but don't install it.  # but don't install it.
 SOLIB=lib${LIB}_pic.a  SOLIB=lib${LIB}_pic.a
 SOBJS+=${OBJS:.o=.so}  SOBJS+=${OBJS:.o=.pico}
 .else  .else
 SOLIB=lib${LIB}.a  SOLIB=lib${LIB}.a
 .endif  .endif
 .else  .else
 SOLIB=lib${LIB}_pic.a  SOLIB=lib${LIB}_pic.a
 _LIBS+=${SOLIB}  _LIBS+=${SOLIB}
 SOBJS+=${OBJS:.o=.so}  SOBJS+=${OBJS:.o=.pico}
 .endif  .endif
 .if defined(SHLIB_FULLVERSION)  .if defined(SHLIB_FULLVERSION)
 _LIBS+=lib${LIB}.so.${SHLIB_FULLVERSION}  _LIBS+=lib${LIB}.so.${SHLIB_FULLVERSION}
Line 431  _YLSRCS= ${SRCS:M*.[ly]:C/\..$/.c/} ${YH
Line 473  _YLSRCS= ${SRCS:M*.[ly]:C/\..$/.c/} ${YH
   
 realall: ${SRCS} ${ALLOBJS:O} ${_LIBS}  realall: ${SRCS} ${ALLOBJS:O} ${_LIBS}
   
   MKARZERO?=no
   
   .if ${MKARZERO} == "yes"
   _ARFL=crsD
   _ARRANFL=sD
   _INSTRANLIB=
   .else
   _ARFL=crs
   _ARRANFL=s
   _INSTRANLIB=${empty(PRESERVE):?-a "${RANLIB} -t":}
   .endif
   
   # If you change this, please consider reflecting the change in
   # the override in sys/rump/Makefile.rump.
 .if !target(__archivebuild)  .if !target(__archivebuild)
 __archivebuild: .USE  __archivebuild: .USE
         ${_MKTARGET_BUILD}          ${_MKTARGET_BUILD}
         rm -f ${.TARGET}          rm -f ${.TARGET}
         ${AR} cq ${.TARGET} `NM=${NM} ${LORDER} ${.ALLSRC:M*o} | ${TSORT}`          ${AR} ${_ARFL} ${.TARGET} `NM=${NM} ${LORDER} ${.ALLSRC:M*o} | ${TSORT}`
         ${RANLIB} ${.TARGET}  
 .endif  .endif
   
 .if !target(__archiveinstall)  .if !target(__archiveinstall)
 __archiveinstall: .USE  __archiveinstall: .USE
         ${_MKTARGET_INSTALL}          ${_MKTARGET_INSTALL}
         ${INSTALL_FILE} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \          ${INSTALL_FILE} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
             ${empty(PRESERVE):?-a "${RANLIB} -t":} ${.ALLSRC} ${.TARGET}              ${_INSTRANLIB} ${.ALLSRC} ${.TARGET}
 .endif  .endif
   
 __archivesymlinkpic: .USE  __archivesymlinkpic: .USE
Line 492  LDADD+= -lgcc_pic
Line 547  LDADD+= -lgcc_pic
 .endif  .endif
 .endif  .endif
   
   .if ${LIBISCXX} != "no"
   LIBCC:= ${CXX}
   .else
   LIBCC:= ${CC}
   .endif
   
   _LDADD.lib${LIB}=       ${LDADD} ${LDADD.lib${LIB}}
   _LDFLAGS.lib${LIB}=     ${LDFLAGS} ${LDFLAGS.lib${LIB}}
   
 lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOLIB} ${DPADD} ${DPLIBC} \  lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOLIB} ${DPADD} ${DPLIBC} \
     ${SHLIB_LDSTARTFILE} ${SHLIB_LDENDFILE}      ${SHLIB_LDSTARTFILE} ${SHLIB_LDENDFILE}
         ${_MKTARGET_BUILD}          ${_MKTARGET_BUILD}
         rm -f lib${LIB}.so.${SHLIB_FULLVERSION}          rm -f lib${LIB}.so.${SHLIB_FULLVERSION}
 .if defined(DESTDIR)  .if defined(DESTDIR)
         ${CC} ${LDLIBC} -Wl,-nostdlib -B${_GCC_CRTDIR}/ -B${DESTDIR}/usr/lib/ \          ${LIBCC} ${LDLIBC} -Wl,-nostdlib -B${_GCC_CRTDIR}/ -B${DESTDIR}${SHLIBDIR}/ \
             ${_LIBLDOPTS} \              -Wl,-x -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \
             -Wl,-x -shared ${SHLIB_SHFLAGS} ${LDFLAGS} -o ${.TARGET} \  
             -Wl,--whole-archive ${SOLIB} \              -Wl,--whole-archive ${SOLIB} \
             -Wl,--no-whole-archive ${LDADD} \              -Wl,--no-whole-archive ${_LDADD.lib${LIB}} \
               ${_LIBLDOPTS} ${_LDFLAGS.lib${LIB}} \
             -L${_GCC_LIBGCCDIR}              -L${_GCC_LIBGCCDIR}
 .else  .else
         ${CC} ${LDLIBC} -Wl,-x -shared ${SHLIB_SHFLAGS} ${LDFLAGS} \          ${LIBCC} ${LDLIBC} -Wl,-x -shared ${SHLIB_SHFLAGS} ${_LDFLAGS.lib${LIB}} \
             -o ${.TARGET} ${_LIBLDOPTS} \              -o ${.TARGET} ${_LIBLDOPTS} \
             -Wl,--whole-archive ${SOLIB} -Wl,--no-whole-archive ${LDADD}              -Wl,--whole-archive ${SOLIB} -Wl,--no-whole-archive ${_LDADD.lib${LIB}}
 .endif  .endif
 .if ${OBJECT_FMT} == "ELF"  .if ${OBJECT_FMT} == "ELF"
 #  We don't use INSTALL_SYMLINK here because this is just  #  We don't use INSTALL_SYMLINK here because this is just
Line 707  ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln:
Line 771  ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln:
 .endif  # !target(libinstall)                                           # }  .endif  # !target(libinstall)                                           # }
   
 ##### Pull in related .mk logic  ##### Pull in related .mk logic
   LINKSOWN?= ${LIBOWN}
   LINKSGRP?= ${LIBGRP}
   LINKSMODE?= ${LIBMODE}
 .include <bsd.man.mk>  .include <bsd.man.mk>
 .include <bsd.nls.mk>  .include <bsd.nls.mk>
 .include <bsd.files.mk>  .include <bsd.files.mk>

Legend:
Removed from v.1.289.2.1  
changed lines
  Added in v.1.305

CVSweb <webmaster@jp.NetBSD.org>