Deleted Added
full compact
2c2
< # $FreeBSD: head/share/mk/bsd.lib.mk 96462 2002-05-12 16:01:00Z ru $
---
> # $FreeBSD: head/share/mk/bsd.lib.mk 96512 2002-05-13 10:53:24Z ru $
7,13d6
< .if exists(${.CURDIR}/shlib_version)
< SHLIB_MAJOR != . ${.CURDIR}/shlib_version ; echo $$major
< .if ${OBJFORMAT} == aout
< SHLIB_MINOR != . ${.CURDIR}/shlib_version ; echo $$minor
< .endif
< .endif
<
51a45,52
> .if !defined(PICFLAG)
> .if ${MACHINE_ARCH} == "sparc64"
> PICFLAG=-fPIC
> .else
> PICFLAG=-fpic
> .endif
> .endif
>
154,160c155
< .if !defined(INTERNALLIB) || defined(INTERNALSTATICLIB)
< .if !defined(NOPROFILE) && !defined(INTERNALLIB)
< _LIBS=lib${LIB}.a lib${LIB}_p.a
< .else
< _LIBS=lib${LIB}.a
< .endif
< .endif
---
> all: objwarn
162,167c157,159
< .if defined(SHLIB_NAME)
< _LIBS+=${SHLIB_NAME}
< .endif
< .if defined(INSTALL_PIC_ARCHIVE)
< _LIBS+=lib${LIB}_pic.a
< .endif
---
> .if defined(LIB) && !empty(LIB)
> _LIBS= lib${LIB}.a
> OBJS+= ${SRCS:N*.h:R:S/$/.o/}
169,175c161,165
< .if !defined(PICFLAG)
< .if ${MACHINE_ARCH} == "sparc64"
< PICFLAG=-fPIC
< .else
< PICFLAG=-fpic
< .endif
< .endif
---
> lib${LIB}.a: ${OBJS} ${STATICOBJS}
> @${ECHO} building static ${LIB} library
> @rm -f ${.TARGET}
> @${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
> ${RANLIB} ${.TARGET}
177c167
< LINTOBJS+= ${SRCS:M*.c:C/\..+$/.ln/}
---
> CLEANFILES+= a.out ${OBJS} ${OBJS:S/$/.tmp/} ${STATICOBJS}
179,182c169
< .if defined(WANT_LINT) && defined(LIB) && defined(LINTOBJS) && !empty(LINTOBJS)
< LINTLIB=llib-l${LIB}.ln
< _LIBS+=${LINTLIB}
< .endif
---
> .if !defined(INTERNALLIB)
184,198d170
< all: objwarn ${_LIBS}
<
< .if !defined(NOMAN)
< all: _manpages
< .endif
<
< OBJS+= ${SRCS:N*.h:R:S/$/.o/g}
<
< lib${LIB}.a:: ${OBJS} ${STATICOBJS}
< @${ECHO} building static ${LIB} library
< @rm -f lib${LIB}.a
< @${AR} cq lib${LIB}.a `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
< ${RANLIB} lib${LIB}.a
<
< POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o=.po}
200c172,175
< lib${LIB}_p.a:: ${POBJS}
---
> _LIBS+= lib${LIB}_p.a
> POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o=.po}
>
> lib${LIB}_p.a: ${POBJS}
202,204c177,181
< @rm -f lib${LIB}_p.a
< @${AR} cq lib${LIB}_p.a `lorder ${POBJS} | tsort -q` ${ARADD}
< ${RANLIB} lib${LIB}_p.a
---
> @rm -f ${.TARGET}
> @${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD}
> ${RANLIB} ${.TARGET}
>
> CLEANFILES+= ${POBJS} ${POBJS:S/$/.tmp/}
207c184
< SOBJS+= ${OBJS:.o=.So}
---
> SOBJS+= ${OBJS:.o=.So}
208a186,187
> CLEANFILES+= ${SOBJS} ${SOBJS:.So=.so} ${SOBJS:S/$/.tmp/}
>
209a189,190
> _LIBS+= ${SHLIB_NAME}
>
212c193
< @rm -f ${SHLIB_NAME} ${SHLIB_LINK}
---
> @rm -f ${.TARGET} ${SHLIB_LINK}
214c195
< @ln -sf ${SHLIB_NAME} ${SHLIB_LINK}
---
> @ln -fs ${.TARGET} ${SHLIB_LINK}
218c199
< -o ${SHLIB_NAME} \
---
> -o ${.TARGET} \
222c203
< -o ${SHLIB_NAME} -Wl,-soname,${SONAME} \
---
> -o ${.TARGET} -Wl,-soname,${SONAME} \
224a206,207
>
> CLEANFILES+= ${SHLIB_LINK} lib${LIB}.so.* lib${LIB}.so
228c211,213
< lib${LIB}_pic.a:: ${SOBJS}
---
> _LIBS+= lib${LIB}_pic.a
>
> lib${LIB}_pic.a: ${SOBJS}
230,232c215,217
< @rm -f lib${LIB}_pic.a
< @${AR} cq lib${LIB}_pic.a ${SOBJS} ${ARADD}
< ${RANLIB} lib${LIB}_pic.a
---
> @rm -f ${.TARGET}
> @${AR} cq ${.TARGET} ${SOBJS} ${ARADD}
> ${RANLIB} ${.TARGET}
235c220,224
< .if defined(WANT_LINT) && defined(LIB) && defined(LINTOBJS) && !empty(LINTOBJS)
---
> .if defined(WANT_LINT)
> LINTLIB= llib-l${LIB}.ln
> _LIBS+= ${LINTLIB}
> LINTOBJS+= ${SRCS:M*.c:.c=.ln}
>
237,238c226,227
< @${ECHO} building lint library ${LINTLIB}
< @rm -f ${LINTLIB}
---
> @${ECHO} building lint library ${.TARGET}
> @rm -f ${.TARGET}
239a229,230
>
> CLEANFILES+= ${LINTOBJS}
242,252c233,241
< .if !target(clean)
< clean:
< rm -f a.out ${OBJS} ${STATICOBJS} ${OBJS:S/$/.tmp/} ${CLEANFILES}
< rm -f lib${LIB}.a
< rm -f ${POBJS} ${POBJS:S/$/.tmp/} lib${LIB}_p.a
< rm -f ${SOBJS} ${SOBJS:.So=.so} ${SOBJS:S/$/.tmp/} \
< ${SHLIB_NAME} ${SHLIB_LINK} \
< lib${LIB}.so.* lib${LIB}.so lib${LIB}_pic.a
< rm -f ${LINTOBJS} ${LINTLIB}
< .if defined(CLEANDIRS) && !empty(CLEANDIRS)
< rm -rf ${CLEANDIRS}
---
> .endif !defined(INTERNALLIB)
>
> all: ${_LIBS}
>
> CLEANFILES+= ${_LIBS}
> .endif defined(LIB) && !empty(LIB)
>
> .if !defined(NOMAN)
> all: _manpages
254d242
< .endif
287a276
> .if defined(LIB) && !empty(LIB) && !defined(INTERNALLIB)
290c279
< .if !defined(INTERNALLIB)
---
> .if !defined(NOINSTALLLIB)
292a282
> .endif
297d286
< .endif
303c292
< ln -sf ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}/${SHLIB_LINK}
---
> ln -fs ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}/${SHLIB_LINK}
310c299
< .if defined(WANT_LINT) && defined(LIB) && defined(LINTOBJS) && !empty(LINTOBJS)
---
> .if defined(WANT_LINT)
313a303
> .endif defined(LIB) && !empty(LIB) && !defined(INTERNALLIB)
359a350
> .if defined(LIB) && !empty(LIB)
362a354
> .endif