Split out MD makefile parts into separate files and do

some other cleanup in the Makefile.
drahn@ ok.

5 files changed, 28 insertions, 34 deletions

diff --git a/libexec/ld.so/Makefile b/libexec/ld.so/Makefile
index bef967ddff5..b2f7fa47d6d 100644
--- a/libexec/ld.so/Makefile
+++ b/libexec/ld.so/Makefile
@@ -1,51 +1,23 @@
-#	$OpenBSD: Makefile,v 1.16 2002/07/27 13:19:26 art Exp $
+#	$OpenBSD: Makefile,v 1.17 2002/08/21 15:40:30 art Exp $
 
 SUBDIR=ldconfig ldd
 VPATH=${.CURDIR}/../../lib/libc/string:${.CURDIR}/../../sys/lib/libsa
 
 NOMAN=
 SRCS=	ldasm.S loader.c library.c resolve.c dlfcn.c dl_printf.c rtld_machine.c
-SRCS+=	util.c
-SRCS+=  sod.c strsep.c strtol.c
-SRCS+=  dir.c
+SRCS+=	util.c sod.c strsep.c strtol.c dir.c
 PROG=	ld.so
 MAN=	ld.so.8
 
-.if (${MACHINE_ARCH} == "sparc64")
-CFLAGS += -fpic -msoft-float
-AFLAGS += -fpic
-.endif
-.if (${MACHINE_ARCH} == "powerpc")
-CFLAGS += -fpic -msoft-float
-.endif
-.if (${MACHINE_ARCH} == "alpha")
-CFLAGS += -fpic -mno-fp-regs
-LIBCSRCDIR=${.CURDIR}/../../lib/libc
-.include "${LIBCSRCDIR}/arch/alpha/Makefile.inc"
-.endif
-.if (${MACHINE_ARCH} == "sparc")
-CFLAGS += -fpic -msoft-float -I${LIBCSRCDIR}/arch/sparc
-AFLAGS = ${CFLAGS}
-LIBCSRCDIR=${.CURDIR}/../../lib/libc
-.include "${LIBCSRCDIR}/arch/sparc/Makefile.inc"
-.PATH: ${LIBCSRCDIR}/arch/sparc/gen/
-SRCS+=umul.S
-.endif
+.include "${.CURDIR}/${MACHINE_ARCH}/Makefile.inc"
+.PATH:	${.CURDIR}/${MACHINE_ARCH}
 
-#CFLAGS += -Werror -Wall -Wno-uninitialized
 CFLAGS += -Werror -Wall
-CFLAGS += -I${.CURDIR} -DNO_UNDERSCORE -DVERBOSE_DLINKER \
-	-D__PIC__ -I${.CURDIR}/${MACHINE_ARCH} \
+CFLAGS += -I${.CURDIR} -D__PIC__ -I${.CURDIR}/${MACHINE_ARCH} \
 	-Dstrsep=_dl_strsep -Dstrtol=_dl_strtol
 INSTALL_STRIP=
 
-.PATH:	${.CURDIR}/${MACHINE_ARCH}
-
-ELF_LDFLAGS=--shared -Bsymbolic # using GNU ld
-.if (${MACHINE_ARCH} == "powerpc")
-ADDR=-Tdata 8000
-ELF_LDFLAGS+=${ADDR} # using GNU ld
-.endif
+ELF_LDFLAGS+=--shared -Bsymbolic
 
 $(PROG):
 	$(LD) -x -e _dl_start $(ELF_LDFLAGS) -o $(PROG) $(OBJS)
diff --git a/libexec/ld.so/alpha/Makefile.inc b/libexec/ld.so/alpha/Makefile.inc
new file mode 100644
index 00000000000..7115f746acb
--- /dev/null
+++ b/libexec/ld.so/alpha/Makefile.inc
@@ -0,0 +1,5 @@
+#	$OpenBSD: Makefile.inc,v 1.1 2002/08/21 15:40:30 art Exp $
+
+CFLAGS += -fpic -mno-fp-regs
+LIBCSRCDIR=${.CURDIR}/../../lib/libc
+.include "${LIBCSRCDIR}/arch/alpha/Makefile.inc"
diff --git a/libexec/ld.so/powerpc/Makefile.inc b/libexec/ld.so/powerpc/Makefile.inc
new file mode 100644
index 00000000000..9d0970e84d5
--- /dev/null
+++ b/libexec/ld.so/powerpc/Makefile.inc
@@ -0,0 +1,5 @@
+#	$OpenBSD: Makefile.inc,v 1.1 2002/08/21 15:40:30 art Exp $
+
+CFLAGS += -fpic -msoft-float
+ADDR=-Tdata 8000
+ELF_LDFLAGS+=${ADDR}
diff --git a/libexec/ld.so/sparc/Makefile.inc b/libexec/ld.so/sparc/Makefile.inc
new file mode 100644
index 00000000000..39fecb8b1e2
--- /dev/null
+++ b/libexec/ld.so/sparc/Makefile.inc
@@ -0,0 +1,8 @@
+#	$OpenBSD: Makefile.inc,v 1.1 2002/08/21 15:40:30 art Exp $
+
+CFLAGS += -fpic -msoft-float -I${LIBCSRCDIR}/arch/sparc
+AFLAGS = ${CFLAGS}
+LIBCSRCDIR=${.CURDIR}/../../lib/libc
+.include "${LIBCSRCDIR}/arch/sparc/Makefile.inc"
+.PATH: ${LIBCSRCDIR}/arch/sparc/gen/
+SRCS+=umul.S
diff --git a/libexec/ld.so/sparc64/Makefile.inc b/libexec/ld.so/sparc64/Makefile.inc
new file mode 100644
index 00000000000..d2418bcf03d
--- /dev/null
+++ b/libexec/ld.so/sparc64/Makefile.inc
@@ -0,0 +1,4 @@
+#	$OpenBSD: Makefile.inc,v 1.1 2002/08/21 15:40:30 art Exp $
+
+CFLAGS += -fpic -msoft-float
+AFLAGS += -fpic