From 296206fdb88ea9f3e9b60e09e34bdfa6ca9d7331 Mon Sep 17 00:00:00 2001
From: tv <tv@NetBSD.org>
Date: Fri, 22 May 1998 03:26:28 +0000
Subject: [PATCH] Workaround nm and .c.a bogons by renaming libbfd.c to
 lib_bfd.c explicitly

---
 gnu/lib/bfd/Makefile  | 15 +++------------
 gnu/lib/bfd/lib_bfd.c |  4 ++++
 2 files changed, 7 insertions(+), 12 deletions(-)
 create mode 100644 gnu/lib/bfd/lib_bfd.c

diff --git a/gnu/lib/bfd/Makefile b/gnu/lib/bfd/Makefile
index 6901036254b9..361443b447cc 100644
--- a/gnu/lib/bfd/Makefile
+++ b/gnu/lib/bfd/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 1998/05/19 19:59:58 tv Exp $
+#	$NetBSD: Makefile,v 1.11 1998/05/22 03:26:28 tv Exp $
 
 LIB=	bfd
 
@@ -33,7 +33,7 @@ CPPFLAGS+= -I$(dist)/include
 # Have to ommit libbfd.c to avoid .c.so rule problem.
 BFD_SRCS= \
 	archive.c archures.c bfd.c cache.c coffgen.c corefile.c \
-	format.c init.c opncls.c reloc.c \
+	format.c init.c lib_bfd.c opncls.c reloc.c \
 	section.c syms.c targets.c hash.c linker.c \
 	elf.c srec.c binary.c tekhex.c ihex.c stabs.c stab-syms.c \
 	$(BFD_BACKENDS) $(BFD_MACHINES) netbsd-core.c
@@ -49,7 +49,6 @@ IBERTY_SRCS= argv.c basename.c choose-temp.c concat.c cplus-dem.c \
   insque.c vasprintf.c
 
 SRCS = $(BFD_SRCS) $(OPCODE_SRCS) $(IBERTY_SRCS)
-OBJS = misc.o
 .include <bsd.lib.mk>
 
 CC_o=	$(CC) $(CFLAGS) $(CPPFLAGS)
@@ -74,15 +73,7 @@ targets.so: $(dist)/bfd/targets.c
 	$(CC_so) $(TDEFAULTS) -c $(.IMPSRC) -o $@
 
 # Avoid the unwanted .c.a default rule
-.NOPATH: libbfd.a libbfd.o libbfd.so
-# XXX $#!%  Why do I STILL get this behaviour:
-# building standard bfd library
-# nm: .../bfd/libbfd.c: not object file or archive
-
-misc.o: $(dist)/bfd/libbfd.c
-	$(CC_o)  -c $(dist)/bfd/libbfd.c -o $@
-misc.so: $(dist)/bfd/libbfd.c
-	$(CC_so) -c $(dist)/bfd/libbfd.c -o $@
+.NOPATH: libbfd.a
 
 # Icky generated header files...
 CLEANFILES+= elf32-target.h elf64-target.h
diff --git a/gnu/lib/bfd/lib_bfd.c b/gnu/lib/bfd/lib_bfd.c
new file mode 100644
index 000000000000..ddcbd9d778d8
--- /dev/null
+++ b/gnu/lib/bfd/lib_bfd.c
@@ -0,0 +1,4 @@
+/*	$NetBSD: lib_bfd.c,v 1.1 1998/05/22 03:26:28 tv Exp $	*/
+/* Get around annoying .c.a/.c.so problems with "libbfd.c". */
+
+#include "libbfd.c"