aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorDavid Edelsohn <dje.gcc@gmail.com>1995-04-28 03:32:06 +0000
committerDavid Edelsohn <dje.gcc@gmail.com>1995-04-28 03:32:06 +0000
commitad0c0b7ffdf878e71e9b54a2172ecef6385526f5 (patch)
tree38576bdf44e40ffe5324c9c7bfcdaf44bdbd0a8b /gdb
parent85f667f79f0458e3c6c0cf6ce0df690d02961dc2 (diff)
downloadgdb-ad0c0b7ffdf878e71e9b54a2172ecef6385526f5.zip
gdb-ad0c0b7ffdf878e71e9b54a2172ecef6385526f5.tar.gz
gdb-ad0c0b7ffdf878e71e9b54a2172ecef6385526f5.tar.bz2
* Makefile.in (RUNTEST): Fix reference of `srcdir'.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog4
-rw-r--r--gdb/Makefile.in23
2 files changed, 22 insertions, 5 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 126648c..4d995c6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+Thu Apr 27 20:29:34 1995 Doug Evans <dje@canuck.cygnus.com>
+
+ * Makefile.in (RUNTEST): Fix reference of `srcdir'.
+
Wed Apr 26 19:01:08 1995 Steve Chamberlain <sac@slash.cygnus.com>
* remote-hms.c: Rewrite to use new monitor conventions.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 6fc2936..93470f2 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -133,6 +133,19 @@ TK = -L$(TK_DIR) -ltk
TK_SRC = $(srcdir)/$(TK_DIR)
TK_CFLAGS = -I$(TK_SRC)
+# A "-I" switch that can be used when compiling to make all of the
+# X11 include files accessible (the configure script will try to
+# set this value, and will cause it to be an empty string if the
+# include files are accessible via /usr/include).
+X11_INCLUDES =
+X11_CFLAGS = $(X11_INCLUDES)
+
+# Linker switch(es) to use to link with the X11 library archive (the
+# configure script will try to set this value automatically, but you
+# can override it).
+X11_LIB_SWITCHES =
+X11_LIBS = -lX11
+
# All the includes used for CFLAGS and for lint.
# -I. for config files.
# -I$(srcdir) for gdb internal headers and possibly for regex.h also.
@@ -194,14 +207,14 @@ CDEPS = $(XM_CDEPS) $(TM_CDEPS) $(NAT_CDEPS) $(BFD) $(READLINE) $(OPCODES) \
ADD_FILES = $(REGEX) $(XM_ADD_FILES) $(TM_ADD_FILES) $(NAT_ADD_FILES)
ADD_DEPS = $(REGEX1) $(XM_ADD_FILES) $(TM_ADD_FILES) $(NAT_ADD_FILES)
-VERSION = 4.13.2
+VERSION = 4.14.1
DIST=gdb
LINT=/usr/5bin/lint
LINTFLAGS= $(BFD_CFLAGS)
-RUNTEST = `if [ -f $${srcdir}/../dejagnu/runtest ] ; then \
- echo $${srcdir}/../dejagnu/runtest ; else echo runtest; \
+RUNTEST = `if [ -f ${srcdir}/../dejagnu/runtest ] ; then \
+ echo ${srcdir}/../dejagnu/runtest ; else echo runtest; \
fi`
RUNTESTFLAGS=
@@ -1117,8 +1130,8 @@ fork-child.o: fork-child.c $(wait_h) $(defs_h) $(gdbcore_h) \
# start-sanitize-gdbtk
gdbtk.o: gdbtk.c $(defs_h) $(symtab_h) $(inferior_h) $(command_h) \
$(bfd_h) symfile.h objfiles.h target.h
- $(CC) -c $(INTERNAL_CFLAGS) $(TCL_CFLAGS) $(TK_CFLAGS) $(srcdir)/gdbtk.c \
- -DGDBTK_FILENAME=\"$(libdir)/gdbtk.tcl\"
+ $(CC) -c $(INTERNAL_CFLAGS) $(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS) \
+ $(srcdir)/gdbtk.c -DGDBTK_FILENAME=\"$(libdir)/gdbtk.tcl\"
# end-sanitize-gdbtk
gdbtypes.o: gdbtypes.c $(bfd_h) complaints.h $(defs_h) $(expression_h) \