Merge Makefiles, moving the build up a level and putting the CPU-specific

build flags into conditionals in the Makefile, fixing a few inconsistencies
in the process.

\o/ miod@

1 files changed, 0 insertions, 59 deletions

diff --git a/lib/csu/sh/Makefile b/lib/csu/sh/Makefile
deleted file mode 100644
index 2e59cd613c1..00000000000
--- a/lib/csu/sh/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-#	$OpenBSD: Makefile,v 1.6 2013/12/03 06:21:41 guenther Exp $
-#	from: @(#)Makefile	8.1 (Berkeley) 6/1/93
-
-OBJS=		crt0.o gcrt0.o crtbegin.o crtend.o crtbeginS.o crtendS.o
-SRCS=		crt0.c crtbegin.c crtbeginS.c crtend.c crtendS.c
-
-ELFDIR=		${.CURDIR}/../common_elf
-.PATH:		${ELFDIR}
-CFLAGS+=	-I${ELFDIR} -I${.CURDIR}
-
-all: ${OBJS}
-
-crt0.o: crt0.c
-	@echo ${COMPILE.c} -DCRT0 -fpie -DPIC ${ELFDIR}/crt0.c -o ${.TARGET}
-	@${COMPILE.c} -DCRT0 -fpie -DPIC ${ELFDIR}/crt0.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-gcrt0.o: crt0.c
-	@echo ${COMPILE.c} -DMCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}
-	@${COMPILE.c} -DMCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtbegin.o: crtbegin.c
-	@echo ${COMPILE.c} -fpie -DPIC ${ELFDIR}/crtbegin.c -o ${.TARGET}
-	@${COMPILE.c} -fpie -DPIC ${ELFDIR}/crtbegin.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtbeginS.o: crtbeginS.c
-	@echo ${COMPILE.c} ${PICFLAG} -DPIC ${ELFDIR}/crtbeginS.c -o ${.TARGET}
-	@${COMPILE.c} ${PICFLAG} -DPIC ${ELFDIR}/crtbeginS.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtend.o: crtend.c
-	@echo ${COMPILE.c} -fpie -DPIC ${ELFDIR}/crtend.c -o ${.TARGET}
-	@${COMPILE.c} -fpie -DPIC ${ELFDIR}/crtend.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtendS.o: crtendS.c
-	@echo ${COMPILE.c} ${PICFLAG} -DPIC ${ELFDIR}/crtendS.c -o ${.TARGET}
-	@${COMPILE.c} ${PICFLAG} -DPIC ${ELFDIR}/crtendS.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-realinstall:
-	${INSTALL} ${INSTALL_COPY} -S -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
-	    ${DESTDIR}/usr/lib
-
-afterdepend:: .depend
-	@(TMP=/tmp/_depend$$$$; \
-	    sed -e 's/^\([^\.]*\).o[ ]*:/\1.o g\1.o:/' \
-	    < .depend > $$TMP; \
-	mv $$TMP .depend)
-
-.include <bsd.prog.mk>