[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.332.2.1 and 1.333

version 1.332.2.1, 2013/03/26 01:54:23 version 1.333, 2013/04/04 21:15:15
Line 52  AFLAGS+=        ${PIE_AFLAGS}
Line 52  AFLAGS+=        ${PIE_AFLAGS}
 # We only add -g to the shared library objects  # We only add -g to the shared library objects
 # because we don't currently split .a archives.  # because we don't currently split .a archives.
 CSHLIBFLAGS+=   -g  CSHLIBFLAGS+=   -g
   .if ${LIBISPRIVATE} == "yes"
   CFLAGS+=        -g
 .endif  .endif
   .endif
   
   
 ##### Libraries that this may depend upon.  ##### Libraries that this may depend upon.
 .if defined(LIBDPLIBS) && ${MKPIC} != "no"                              # {  .if defined(LIBDPLIBS) && ${MKPIC} != "no"                              # {
Line 218  CTFFLAGS+= -g
Line 222  CTFFLAGS+= -g
 .endif  .endif
 .endif  .endif
   
   LIBSTRIPAOBJS=  yes
   .if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
   LIBSTRIPCOBJS=  yes
   .endif
   .if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*)
   LIBSTRIPOBJCOBJS=       yes
   .endif
   .if !defined(FFLAGS) || empty(FFLAGS:M*-g*)
   LIBSTRIPFOBJS=  yes
   .endif
   .if !defined(CSHLIBFLAGS) || empty(CSHLIBFLAGS:M*-g*)
   LIBSTRIPSHLIBOBJS=      yes
   .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)  .if defined(CTFCONVERT)
         ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}          ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif  .endif
 .if !defined(CFLAGS) || empty(CFLAGS:M*-g*)  .if defined(LIBSTRIPCOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif  .endif
   
Line 234  CTFFLAGS+= -g
Line 252  CTFFLAGS+= -g
 .if defined(CTFCONVERT)  .if defined(CTFCONVERT)
         ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}          ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif  .endif
 .if !defined(CFLAGS) || empty(CFLAGS:M*-g*)  .if defined(LIBSTRIPCOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif  .endif
   
Line 245  CTFFLAGS+= -g
Line 263  CTFFLAGS+= -g
 .c.pico:  .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(CSHLIBFLAGS) || empty(CSHLIBFLAGS:M*-g*)  .if defined(LIBSTRIPSHLIBOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif  .endif
   
 .cc.o .cpp.o .cxx.o .C.o:  .cc.o .cpp.o .cxx.o .C.o:
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
         ${COMPILE.cc} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}          ${COMPILE.cc} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
 .if !defined(CFLAGS) || empty(CFLAGS:M*-g*)  .if defined(LIBSTRIPCOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif  .endif
   
 .cc.po .cpp.po .cxx.po .C.po:  .cc.po .cpp.po .cxx.po .C.po:
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
         ${COMPILE.cc} ${PROFFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -pg ${.IMPSRC} -o ${.TARGET}          ${COMPILE.cc} ${PROFFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -pg ${.IMPSRC} -o ${.TARGET}
 .if !defined(CFLAGS) || empty(CFLAGS:M*-g*)  .if defined(LIBSTRIPCOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif  .endif
   
Line 270  CTFFLAGS+= -g
Line 288  CTFFLAGS+= -g
 .cc.pico .cpp.pico .cxx.pico .C.pico:  .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(CSHLIBFLAGS) || empty(CSHLIBFLAGS:M*-g*)  .if defined(LIBSTRIPSHLIBOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif  .endif
   
Line 280  CTFFLAGS+= -g
Line 298  CTFFLAGS+= -g
 .if defined(CTFCONVERT)  .if defined(CTFCONVERT)
         ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}          ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif  .endif
 .if !defined(FOPTS) || empty(FOPTS:M*-g*)  .if defined(LIBSTRIPFOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif  .endif
   
Line 290  CTFFLAGS+= -g
Line 308  CTFFLAGS+= -g
 .if defined(CTFCONVERT)  .if defined(CTFCONVERT)
         ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}          ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif  .endif
 .if !defined(FOPTS) || empty(FOPTS:M*-g*)  .if defined(LIBSTRIPFOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif  .endif
   
Line 301  CTFFLAGS+= -g
Line 319  CTFFLAGS+= -g
 .f.pico:  .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(LIBSTRIPFOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif  .endif
   
Line 315  CTFFLAGS+= -g
Line 333  CTFFLAGS+= -g
 .if defined(CTFCONVERT)  .if defined(CTFCONVERT)
         ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}          ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif  .endif
 .if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*)  .if defined(LIBSTRIPOBJCOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif  .endif
   
Line 325  CTFFLAGS+= -g
Line 343  CTFFLAGS+= -g
 .if defined(CTFCONVERT)  .if defined(CTFCONVERT)
         ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}          ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif  .endif
 .if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*)  .if defined(LIBSTRIPOBJCOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif  .endif
   
 .m.go:  .m.go:
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
         ${COMPILE.m} ${DEBUGFLAGS} -g ${OBJCOPTS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}          ${COMPILE.m} ${DEBUGFLAGS} -g ${OBJCOPTS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
 .if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*)  .if defined(LIBSTRIPOBJCOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif  .endif
   
 .m.pico:  .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(LIBSTRIPOBJCOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
 .endif  .endif
   
Line 349  CTFFLAGS+= -g
Line 367  CTFFLAGS+= -g
 .if defined(CTFCONVERT)  .if defined(CTFCONVERT)
         ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}          ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif  .endif
   .if defined(LIBSTRIPAOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
   .endif
   
 .S.o:  .S.o:
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
Line 357  CTFFLAGS+= -g
Line 377  CTFFLAGS+= -g
 .if defined(CTFCONVERT)  .if defined(CTFCONVERT)
         ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}          ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif  .endif
   .if defined(LIBSTRIPAOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
   .endif
   
 .s.po:  .s.po:
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
Line 365  CTFFLAGS+= -g
Line 387  CTFFLAGS+= -g
 .if defined(CTFCONVERT)  .if defined(CTFCONVERT)
         ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}          ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif  .endif
   .if defined(LIBSTRIPAOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
   .endif
   
 .S.po:  .S.po:
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
Line 373  CTFFLAGS+= -g
Line 397  CTFFLAGS+= -g
 .if defined(CTFCONVERT)  .if defined(CTFCONVERT)
         ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}          ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif  .endif
   .if defined(LIBSTRIPAOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
   .endif
   
 .s.go:  .s.go:
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
Line 386  CTFFLAGS+= -g
Line 412  CTFFLAGS+= -g
 .s.pico:  .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}
   .if defined(LIBSTRIPAOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
   .endif
   
 .S.pico:  .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}
   .if defined(LIBSTRIPAOBJS)
         ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}          ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
   .endif
   
 # Declare a few variables to make our life easier later.  # Declare a few variables to make our life easier later.
 _LIB:=${_LIB_PREFIX}${LIB}  _LIB:=${_LIB_PREFIX}${LIB}
Line 441  OBJS+=  ${_LIB}_combine.o
Line 471  OBJS+=  ${_LIB}_combine.o
 ${_LIB}_combine.o: ${COMBINESRCS}  ${_LIB}_combine.o: ${COMBINESRCS}
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
         ${COMPILE.c} -MD --combine ${.ALLSRC} -o ${.TARGET}          ${COMPILE.c} -MD --combine ${.ALLSRC} -o ${.TARGET}
 .if !defined(CFLAGS) || empty(CFLAGS:M*-g*)  .if defined(LIBSTRIPOBJS)
         ${OBJCOPY} -x ${.TARGET}          ${OBJCOPY} -x ${.TARGET}
 .endif  .endif
   
Line 455  CLEANFILES+= ${_LIB}_combine.d
Line 485  CLEANFILES+= ${_LIB}_combine.d
 OBJS+=${SRCS:N*.h:N*.sh:R:S/$/.o/g}  OBJS+=${SRCS:N*.h:N*.sh:R:S/$/.o/g}
 .endif                                                  # }  .endif                                                  # }
   
 # Symbol versioning  
 MK_SYMVER?=no  
 .if ${MK_SYMVER} == "yes"  
 VERSION_MAP?=   ${.CURDIR}/Version.map  
 .  if exists(${VERSION_MAP})  
 LDFLAGS+=       -Wl,--version-script=${VERSION_MAP}  
 .  endif  
 .endif  
   
 STOBJS+=${OBJS}  STOBJS+=${OBJS}
   
 LOBJS+=${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.ln}  LOBJS+=${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.ln}

Legend:
Removed from v.1.332.2.1  
changed lines
  Added in v.1.333

CVSweb <webmaster@jp.NetBSD.org>