--- gdb/Makefile	2018/04/24 17:53:57	1.1
+++ gdb/Makefile	2018/04/24 17:54:45	1.1.1.3
@@ -1,18 +1,20 @@
 # -I. for "#include <obstack.h>"
 CFLAGS = -g -I.
+# NOTE!!! -O  may FAIL TO WORK!  See initialize.h for some weird hacks.
+CC = cc
+BISON = bison
+
 # define this to be "obstack.o" if you don't have the obstack library installed
 # you must at the same time define OBSTACK1 as "obstack.o" 
 # so that the dependencies work right.
-#OBSTACK = -lobstack
 OBSTACK = obstack.o
-OBSTACK1 =
+OBSTACK1 = obstack.o
 
 STARTOBS = main.o firstfile.o
 
 OBS = blockframe.o breakpoint.o findvar.o stack.o source.o \
-
     values.o eval.o valops.o valarith.o valprint.o printcmd.o \
-    symtab.o symmisc.o dbxread.o infcmd.o infrun.o
+    symtab.o symmisc.o coffread.o dbxread.o infcmd.o infrun.o remote.o
 
 TSOBS = core.o inflow.o
 
@@ -25,8 +27,12 @@ TSSTART = /lib/crt0.o
 
 NTSSTART = kdb-start.o
 
-gdb : $(STARTOBS) $(OBS) $(TSOBS) $(ENDOBS) $(OBSTACK1)
-	ld -o gdb $(TSSTART) $(STARTOBS) $(OBS) $(TSOBS) $(ENDOBS) -lc -lg $(OBSTACK)
+gdb+: $(STARTOBS) $(OBS) $(TSOBS) $(ENDOBS) $(OBSTACK1)
+	$(CC) -o gdb+ $(STARTOBS) $(OBS) $(TSOBS) $(ENDOBS) -lc -lg $(OBSTACK)
+
+xgdb+ : $(STARTOBS) $(OBS) xgdb.o $(TSOBS) $(ENDOBS) $(OBSTACK1)
+	$(CC) -o xgdb+ $(STARTOBS) $(OBS) xgdb.o $(TSOBS) $(ENDOBS) \
+           -lXtk11 -lXrm -lX11 -lg $(OBSTACK)
 
 kdb : $(NTSSTART) $(STARTOBS) $(OBS) $(NTSOBS) $(ENDOBS) $(OBSTACK1)
 	ld -o kdb $(NTSSTART) $(STARTOBS) $(OBS) $(NTSOBS) $(ENDOBS) -lc -lg $(OBSTACK)
@@ -34,16 +40,16 @@ kdb : $(NTSSTART) $(STARTOBS) $(OBS) $(N
 blockframe.o : blockframe.c defs.h initialize.h param.h symtab.h frame.h
 breakpoint.o : breakpoint.c defs.h initialize.h param.h symtab.h frame.h
 command.o : command.c command.h
+coffread.o : coffread.c defs.h initialize.h param.h symtab.h
 core.o : core.c defs.h initialize.h param.h
 dbxread.o : dbxread.c defs.h initialize.h param.h symtab.h
 environ.o : environ.c environ.h
 expprint.o : expprint.c defs.h symtab.h expression.h
 expread.tab.c : expread.y
-	@echo 'Expect 96 shift/reduce conflicts.'
-	yacc expread.y
-	mv y.tab.c expread.tab.c
+	@echo 'Expect 101 shift/reduce conflicts and 1 reduce/reduce conflict.'
+	$(BISON) -v expread.y
 expread.o : expread.tab.c defs.h param.h symtab.h frame.h expression.h
-	cc -c ${CFLAGS} expread.tab.c
+	$(CC) -c ${CFLAGS} expread.tab.c
 	mv expread.tab.o expread.o
 eval.o : eval.c defs.h initialize.h symtab.h value.h expression.h
 findvar.o : findvar.c defs.h initialize.h param.h symtab.h frame.h value.h
@@ -59,6 +65,7 @@ main.o : main.c defs.h command.h
 pinsn.o : pinsn.c defs.h param.h symtab.h \
     vax-opcode.h vax-pinsn.c m68k-opcode.h m68k-pinsn.c
 printcmd.o : printcmd.c defs.h initialize.h param.h symtab.h value.h expression.h
+remote.o : remote.c defs.h initialize.h param.h frame.h inferior.h
 source.o : source.c defs.h initialize.h symtab.h
 stack.o : stack.c defs.h initialize.h param.h symtab.h frame.h
 standalone.o : standalone.c defs.h initialize.h param.h symtab.h frame.h inferior.h wait.h
@@ -70,5 +77,7 @@ valops.o : valops.c defs.h initialize.h
 valprint.o : valprint.c defs.h initialize.h symtab.h value.h
 values.o : values.c defs.h initialize.h param.h symtab.h value.h
 version.o : version.c
+xgdb.o : xgdb.c defs.h initialize.h param.h symtab.h frame.h
+	$(CC) -c $(CFLAGS) xgdb.c -o $@
 
 obstack.o : obstack.c