From: Stu Grossman <grossman@cygnus>
Date: Tue, 16 Jan 1996 19:53:13 +0000 (+0000)
Subject: 	* Makefile.in (CLIBS):  Add LIBS to allow libraries to be
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=640086fd70a5d99224c3f615492217a7e69c3cf8;p=binutils-gdb.git

	* Makefile.in (CLIBS):  Add LIBS to allow libraries to be
	specified on the make command line (via make LIBS=xxx).
start-sanitize-gm
	* configure.in (enable-gm):  magic.o -> gmagic.o.
end-sanitize-gm
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7f8db8b19ac..4710854cee1 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+Tue Jan 16 11:22:58 1996  Stu Grossman  (grossman@cygnus.com)
+
+	* Makefile.in (CLIBS):  Add LIBS to allow libraries to be
+	specified on the make command line (via make LIBS=xxx).
+start-sanitize-gm
+	* configure.in (enable-gm):  magic.o -> gmagic.o.
+end-sanitize-gm
+
 Tue Jan 16 18:00:35 1996  James G. Smith  <jsmith@cygnus.co.uk>
 
 	* remote-mips.c (pmon_opn, pmon_wait, pmon_makeb64, pmon_zeroset,
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 8fb38f6df80..34fada98c2a 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -201,7 +201,7 @@ INSTALLED_LIBS=-lbfd -lreadline $(TERMCAP) -lopcodes -lmmalloc \
 	-liberty $(XM_CLIBS) $(TM_CLIBS) $(NAT_CLIBS) $(ENABLE_CLIBS)
 CLIBS = $(SIM) $(BFD) $(READLINE) $(OPCODES) $(MMALLOC) $(LIBIBERTY) \
 	$(ENABLE_CLIBS) $(TERMCAP) $(XM_CLIBS) $(TM_CLIBS) $(NAT_CLIBS) \
-	$(LIBIBERTY)
+	$(LIBIBERTY) $(LIBS)
 CDEPS = $(XM_CDEPS) $(TM_CDEPS) $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE) \
 	$(OPCODES) $(MMALLOC) $(LIBIBERTY)
 
diff --git a/gdb/configure.in b/gdb/configure.in
index 8a4bfed71f9..959e7b4bb10 100644
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -64,7 +64,7 @@ ENABLE_GM=
 AC_ARG_ENABLE(gm,
 [  --enable-gm ],
 [case "${enableval}" in
-yes)	ENABLE_OBS="${ENABLE_OBS} magic.o"
+yes)	ENABLE_OBS="${ENABLE_OBS} gmagic.o"
 	ENABLE_CFLAGS=-DGENERAL_MAGIC
 	;;
 no)	;;