From 2ec604df9766bf52e1e4c99202a8a1a14c54d08a Mon Sep 17 00:00:00 2001
From: "J.T. Conklin" <jtc@acorntoolworks.com>
Date: Fri, 18 Nov 1994 18:49:56 +0000
Subject: [PATCH] * Makefile.in (LD_FOR_TARGET, NLMCONV_FOR_TARGET): Removed.

* nlm/Makefile.in (gdbserve.O): Link with ${CC_FOR_TARGET}.
  (LD_FOR_TARGET): Removed.
---
 gdb/ChangeLog       | 13 +++++++++++++
 gdb/Makefile.in     | 26 +-------------------------
 gdb/nlm/Makefile.in | 13 +------------
 3 files changed, 15 insertions(+), 37 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1ebf3c46cea..7c4d3db5059 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,16 @@
+Fri Nov 18 10:38:12 1994  J.T. Conklin  <jtc@rtl.cygnus.com>
+
+	* Makefile.in (LD_FOR_TARGET, NLMCONV_FOR_TARGET): Removed.
+
+	* nlm/Makefile.in (gdbserve.O): Link with ${CC_FOR_TARGET}.
+	  (LD_FOR_TARGET): Removed.
+
+Thu Nov 17 22:09:50 1994  Rob Savoye  <rob@darkstar.cygnus.com>
+
+	* monitor.[ch], w89k-rom.c, op50n-rom.c, idp-rom.c: Add support
+	for two variables used to control the load protocol and conversion
+	type.
+
 Thu Nov 17 17:51:12 1994  Stan Shebs  (shebs@andros.cygnus.com)
 
 	Support for different MIPS IDT processor models.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 7fd2621eb74..ef621053d99 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -292,28 +292,6 @@ CHILL_FOR_TARGET = ` \
   fi`
 CHILL_LIB = -lchill
 
-NLMCONV_FOR_TARGET = ` \
-  if [ -f $${rootme}/../binutils/nlmconv ] ; then \
-    echo $${rootme}/../binutils/nlmconv; \
-  else \
-    if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
-      echo $(NLMCONV); \
-    else \
-      t='$(program_transform_name)'; echo nlmconv | sed -e '' $$t; \
-    fi; \
-  fi`
-
-LD_FOR_TARGET = ` \
-  if [ -f $${rootme}/../ld/ld.new ] ; then \
-    echo $${rootme}/../ld/ld.new; \
-  else \
-    if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
-      echo $(LD); \
-    else \
-      t='$(program_transform_name)'; echo ld | sed -e '' $$t; \
-    fi; \
-  fi`
-
 # The use of $$(x_FOR_TARGET) reduces the command line length by not
 # duplicating the lengthy definition.
 TARGET_FLAGS_TO_PASS = \
@@ -334,9 +312,7 @@ TARGET_FLAGS_TO_PASS = \
 	"INSTALL=$(INSTALL)" \
 	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
 	"INSTALL_DATA=$(INSTALL_DATA)" \
-	"LD_FOR_TARGET=$(LD_FOR_TARGET)" \
 	"MAKEINFO=$(MAKEINFO)" \
-	"NLMCONV_FOR_TARGET=$(NLMCONV_FOR_TARGET)" \
 	"RUNTEST=$(RUNTEST)" \
 	"RUNTESTFLAGS=$(RUNTESTFLAGS)"
 
@@ -537,7 +513,7 @@ install-only:
 	fi ; \
 	$(INSTALL_PROGRAM) gdb $(bindir)/$$transformed_name ; \
 	$(INSTALL_DATA) $(srcdir)/gdb.1 $(man1dir)/$$transformed_name.1
-	if [ -n $(ENABLE_GDBTK) ] ; then \
+	if [ x"$(ENABLE_GDBTK)" != x ] ; then \
 		$(INSTALL_DATA) $(srcdir)/gdbtk.tcl $(libdir)/gdbtk.tcl ; \
 	fi
 	@$(MAKE) DO=install "DODIRS=$(SUBDIRS)" $(FLAGS_TO_PASS) subdir_do 
diff --git a/gdb/nlm/Makefile.in b/gdb/nlm/Makefile.in
index a99e8a2bca3..d89b88c76ca 100644
--- a/gdb/nlm/Makefile.in
+++ b/gdb/nlm/Makefile.in
@@ -73,17 +73,6 @@ NLMCONV_FOR_TARGET = ` \
     fi; \
   fi`
 
-LD_FOR_TARGET = ` \
-  if [ -f ../../ld/ld.new ] ; then \
-    echo ../../ld/ld.new; \
-  else \
-    if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
-      echo $(LD); \
-    else \
-      t='$(program_transform_name)'; echo ld | sed -e '' $$t; \
-    fi; \
-  fi`
-
 AR = ar
 AR_FLAGS = qv
 RANLIB = ranlib
@@ -193,7 +182,7 @@ gdbserve.nlm:	gdbserve.O $(srcdir)/gdbserve.def
 	${NLMCONV_FOR_TARGET} -T $(srcdir)/gdbserve.def
 
 gdbserve.O: prelude.o gdbserve.o $(TDEPFILES)
-	${LD_FOR_TARGET} $(LDFLAGS) -r -o gdbserve.O prelude.o gdbserve.o ${TDEPFILES}
+	${CC_FOR_TARGET} $(LDFLAGS) -r -o gdbserve.O prelude.o gdbserve.o ${TDEPFILES}
 
 config.status:
 	@echo "You must configure gdbserver.  Look at the README file for details."
-- 
2.30.2