From 4d9cbbf0857f595436852eb4aec8cdf019c64cbc Mon Sep 17 00:00:00 2001
From: Simon Schubert <corecode@dragonflybsd.org>
Date: Thu, 27 Jul 2006 00:30:10 +0000
Subject: [PATCH] Restructure Makefiles to accomodate multiple archs

---
 gnu/usr.bin/gdb/libbfd/Makefile.amd64 |  4 ++--
 gnu/usr.bin/gdb/libgdb/Makefile       |  5 +----
 gnu/usr.bin/gdb/libgdb/Makefile.amd64 | 19 ++++++++++---------
 gnu/usr.bin/gdb/libgdb/Makefile.i386  | 13 +++++++------
 4 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/gnu/usr.bin/gdb/libbfd/Makefile.amd64 b/gnu/usr.bin/gdb/libbfd/Makefile.amd64
index 11e8209e0e..bbbbe06a00 100644
--- a/gnu/usr.bin/gdb/libbfd/Makefile.amd64
+++ b/gnu/usr.bin/gdb/libbfd/Makefile.amd64
@@ -1,8 +1,8 @@
-# $DragonFly: src/gnu/usr.bin/gdb/libbfd/Makefile.amd64,v 1.1 2005/10/01 12:40:33 corecode Exp $
+# $DragonFly: src/gnu/usr.bin/gdb/libbfd/Makefile.amd64,v 1.2 2006/07/27 00:30:10 corecode Exp $
 
 SRCS+=	elf32-gen.c elf32.c elf32-target.h
 SRCS+=	coff-i386.c cpu-i386.c elf32-i386.c
-SRCS+=	elf64-gen.c elf64.c elf64-x86-i386.c elf64-target.h
+SRCS+=	elf64-gen.c elf64.c elf64-x86-64.c elf64-target.h
 
 CFLAGS+= -DDEFAULT_VECTOR=bfd_elf64_x86_64_vec \
   -DSELECT_VECS='&bfd_elf64_x86_64_vec,&bfd_elf32_i386_freebsd_vec,&bfd_elf64_little_generic_vec,&bfd_elf64_big_generic_vec,&i386coff_vec,&bfd_elf32_little_generic_vec,&bfd_elf32_big_generic_vec' \
diff --git a/gnu/usr.bin/gdb/libgdb/Makefile b/gnu/usr.bin/gdb/libgdb/Makefile
index b0a6046f43..ca79a1a681 100644
--- a/gnu/usr.bin/gdb/libgdb/Makefile
+++ b/gnu/usr.bin/gdb/libgdb/Makefile
@@ -1,4 +1,4 @@
-# $DragonFly: src/gnu/usr.bin/gdb/libgdb/Makefile,v 1.1 2006/03/07 15:48:11 corecode Exp $
+# $DragonFly: src/gnu/usr.bin/gdb/libgdb/Makefile,v 1.2 2006/07/27 00:30:10 corecode Exp $
 
 .include "../Makefile.inc"
 
@@ -95,7 +95,4 @@ observer.h: observer.sh observer.inc doc/observer.texi
 observer.inc: observer.sh doc/observer.texi
 	sh ${CONTRIBDIR}/observer.sh inc ${CONTRIBDIR}/doc/observer.texi ${.TARGET}
 
-nm.h: nm-fbsd.h
-	cp ${.ALLSRC} ${.TARGET}
-
 .include <bsd.lib.mk>
diff --git a/gnu/usr.bin/gdb/libgdb/Makefile.amd64 b/gnu/usr.bin/gdb/libgdb/Makefile.amd64
index cb19fe7adf..010b4d5ec9 100644
--- a/gnu/usr.bin/gdb/libgdb/Makefile.amd64
+++ b/gnu/usr.bin/gdb/libgdb/Makefile.amd64
@@ -1,16 +1,17 @@
-# $DragonFly: src/gnu/usr.bin/gdb/libgdb/Makefile.amd64,v 1.1 2006/03/07 15:48:11 corecode Exp $
+# $DragonFly: src/gnu/usr.bin/gdb/libgdb/Makefile.amd64,v 1.2 2006/07/27 00:30:10 corecode Exp $
 
-SRCS+=	amd64-nat.c amd64-tdep.c amd64bsd-nat.c amd64fbsd-nat.c
+SRCS+=	amd64-nat.c amd64-tdep.c amd64bsd-nat.c amd64fbsd-nat.c bsd-kvm.c
 SRCS+=	amd64fbsd-tdep.c i386-tdep.c i386bsd-tdep.c i386fbsd-tdep.c
 SRCS+=	i387-tdep.c
 
-tm.h: ${CONTRIBDIR}/config/i386/tm-fbsd.h
-	cp ${.ALLSRC} ${.TARGET}
+# Hack to avoid compilation of the wrong file
+SRCS:=	${SRCS:N*i386bsd-nat.c*:N*i386fbsd-nat.c*}
 
-xm.h: ${CONTRIBDIR}/config/i386/xm-i386.h
-	cp ${.ALLSRC} ${.TARGET}
+nm.h:
+	echo '#include "i386/nm-fbsd64.h"' > ${.TARGET}
 
-kvm-fbsd.h:
-	echo '#include "kvm-fbsd-i386.h"' > ${.TARGET}
+tm.h:
+	echo '#include "i386/tm-fbsd.h"' > ${.TARGET}
 
-CLEANFILES+=	kvm-fbsd.h
+xm.h:
+	echo '#include "i386/xm-i386.h"' > ${.TARGET}
diff --git a/gnu/usr.bin/gdb/libgdb/Makefile.i386 b/gnu/usr.bin/gdb/libgdb/Makefile.i386
index f5feb82e9d..285b8b0edd 100644
--- a/gnu/usr.bin/gdb/libgdb/Makefile.i386
+++ b/gnu/usr.bin/gdb/libgdb/Makefile.i386
@@ -1,12 +1,13 @@
-# $DragonFly: src/gnu/usr.bin/gdb/libgdb/Makefile.i386,v 1.1 2006/03/07 15:48:11 corecode Exp $
+# $DragonFly: src/gnu/usr.bin/gdb/libgdb/Makefile.i386,v 1.2 2006/07/27 00:30:10 corecode Exp $
 
 SRCS+=	i386-nat.c i386-tdep.c i386bsd-nat.c i386bsd-tdep.c i386fbsd-nat.c
 SRCS+=	i386fbsd-tdep.c i387-tdep.c
 
-tm.h: ${CONTRIBDIR}/config/i386/tm-fbsd.h
-	cp ${.ALLSRC} ${.TARGET}
+nm.h:
+	echo '#include "i386/nm-fbsd.h"' > ${.TARGET}
 
-xm.h: ${CONTRIBDIR}/config/i386/xm-i386.h
-	cp ${.ALLSRC} ${.TARGET}
+tm.h:
+	echo '#include "i386/tm-fbsd.h"' > ${.TARGET}
 
-CLEANFILES+=	kvm-fbsd.h
+xm.h:
+	echo '#include "i386/xm-i386.h"' > ${.TARGET}
-- 
2.41.0