--- gdb/Makefile	2018/04/24 17:53:57	1.1
+++ gdb/Makefile	2018/04/24 17:54:05	1.1.1.2
@@ -1,18 +1,18 @@
 # -I. for "#include <obstack.h>"
-CFLAGS = -g -I.
+CFLAGS = -g -I. -Dvfork=fork -DDEBUG
+# NOTE!!! -O  may FAIL TO WORK!  See initialize.h for some weird hacks.
+
 # 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 =
+OBSTACK = obstack.o alloca.o -lPW
+OBSTACK1 = obstack.o alloca.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
 
 TSOBS = core.o inflow.o
 
@@ -26,14 +26,23 @@ 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)
+	$(CC) -o gdb $(STARTOBS) $(OBS) $(TSOBS) $(ENDOBS) -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)
 
+clean:
+	rm -f $(STARTOBS) $(OBS) $(TSOBS) $(OBSTACK1) $(NTSSTART) $(NTSOBS)
+	rm -f xgdb.o gdb xgdb kdb tags errs expread.tab.c
+
 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
@@ -43,7 +52,7 @@ expread.tab.c : expread.y
 	yacc expread.y
 	mv y.tab.c expread.tab.c
 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
@@ -70,5 +79,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