Start removing the old build infrastructure for the a.out
[dragonfly.git] / share / mk / bsd.lib.mk
index 4d24334..e2031e5 100644 (file)
@@ -1,6 +1,6 @@
 #      from: @(#)bsd.lib.mk    5.26 (Berkeley) 5/2/91
 # $FreeBSD: src/share/mk/bsd.lib.mk,v 1.91.2.15 2002/08/07 16:31:50 ru Exp $
-# $DragonFly: src/share/mk/bsd.lib.mk,v 1.4 2004/03/05 01:06:50 joerg Exp $
+# $DragonFly: src/share/mk/bsd.lib.mk,v 1.5 2004/03/20 16:27:41 drhodus Exp $
 #
 
 .include <bsd.init.mk>
@@ -13,7 +13,6 @@
 .undef SHLIB_NAME
 .undef INSTALL_PIC_ARCHIVE
 .else
-.if ${OBJFORMAT} == elf
 .if !defined(SHLIB_NAME) && defined(LIB) && defined(SHLIB_MAJOR)
 SHLIB_NAME=    lib${LIB}.so.${SHLIB_MAJOR}
 .endif
@@ -21,11 +20,6 @@ SHLIB_NAME=  lib${LIB}.so.${SHLIB_MAJOR}
 SHLIB_LINK?=   ${SHLIB_NAME:R}
 .endif
 SONAME?=       ${SHLIB_NAME}
-.else
-.if defined(SHLIB_MAJOR) && defined(SHLIB_MINOR)
-SHLIB_NAME?=   lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
-.endif
-.endif
 .endif
 
 .if defined(DEBUG_FLAGS)
@@ -36,9 +30,7 @@ CFLAGS+= ${DEBUG_FLAGS}
 STRIP?=        -s
 .endif
 
-.if ${OBJFORMAT} != aout || make(checkdpadd) || defined(NEED_LIBNAMES)
 .include <bsd.libnames.mk>
-.endif
 .if defined(USEGNUDIR)
 USELIBDIR?=${GCCLIBDIR}
 USESHLIBDIR?=${GCCSHLIBDIR}
@@ -200,16 +192,10 @@ ${SHLIB_NAME}: ${SOBJS}
 .if defined(SHLIB_LINK)
        @ln -fs ${.TARGET} ${SHLIB_LINK}
 .endif
-.if ${OBJFORMAT} == aout
-       @${CC} -shared -Wl,-x,-assert,pure-text \
-           -o ${.TARGET} \
-           `lorder ${SOBJS} | tsort -q` ${LDADD}
-.else
        @${CC} ${LDFLAGS} -shared -Wl,-x \
            -o ${.TARGET} -Wl,-soname,${SONAME} \
            `lorder ${SOBJS} | tsort -q` ${LDADD}
 .endif
-.endif
 
 .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB)
 _LIBS+=                lib${LIB}_pic.a
@@ -235,16 +221,10 @@ _EXTRADEPEND:
            > $$TMP; \
        mv $$TMP ${DEPENDFILE}
 .if !defined(NOEXTRADEPEND) && defined(SHLIB_NAME)
-.if ${OBJFORMAT} == aout
-       echo ${SHLIB_NAME}: \
-           `${CC} -shared -Wl,-f ${LDADD}` \
-           >> ${DEPENDFILE}
-.else
 .if defined(DPADD) && !empty(DPADD)
        echo ${SHLIB_NAME}: ${DPADD} >> ${DEPENDFILE}
 .endif
 .endif
-.endif
 
 .if !target(install)