From: Keith Seitz <keiths@cygnus.com>
To: <gdb-patches@sources.redhat.com>
Cc: Insight Maling List <insight@sources.redhat.com>
Subject: [RFA/insight] Makefile.in tweaks
Date: Wed, 15 Aug 2001 13:25:00 -0000 [thread overview]
Message-ID: <Pine.GSO.4.33.0108151301550.25893-100000@makita.cygnus.com> (raw)
Hi,
This patch prepares Insight for a long-awaited decoupling of Insight and
Tcl/Tk. Very soon, people will be able to use net releases of Tcl/Tk to
build Insight.
Changes made:
1) Renames the (insight) install directory from "gdbtcl" to
"insight$(GDBTK_VERSION)".
2) Passes autoconf's srcdir to gdbtk.c so that it may determine where the
tcl, tk, tix, itcl, ... libraries are when running from the build
directory. This is the largest hack that currently exists in our local
copies of tcl/tk. The logic is now largely moved into Insight (as it
should be).
3) No longer need to make symlink to gdbtk's tcl library. Removed those
bits of the makefile.
This patch was developed by Ian Roxborough and me. I have, of course,
tested this on linux, win2k, and win98 in various configurations.
These changes do not impact gdb at all, but it _is_ your Makefile.in.
Keith
ChangeLog
2001-08-15 Keith Seitz <keiths@redhat.com>
* Makefile.in (GDBTK_VERSION): Set a version number.
(GDBTK_LIBRARY): New variable to point to location where
gdbtk will install its tcl library. Changed all refereneces
to $(datadir)/insight1.0 to $(GDBTK_LIBRARY).
(SUBDIR_GDBTK_ALL): Remove "all-gdbtk". No longer needed.
(SUBDIR_GDBTK_CLEAN): Remove "clean-gdbtk". No longer needed.
(all-gdbtk): Remove.
(install-gdbtk): Remove.
(gdbtk.o): Pass srcdir to file when compiling.
2001-08-15 Ian Roxborough <irox@redhat.com>
* Makefile.in: Changed all references to the install directory
"gdbtcl" to read "insight1.0".
Patch
Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/Makefile.in,v
retrieving revision 1.110
diff -u -p -r1.110 Makefile.in
--- Makefile.in 2001/08/11 00:59:29 1.110
+++ Makefile.in 2001/08/15 20:24:01
@@ -265,6 +265,11 @@ LIBGUI = @LIBGUI@
GUI_CFLAGS_X = @GUI_CFLAGS_X@
IDE_CFLAGS=$(GUI_CFLAGS_X) $(IDE_CFLAGS_X)
+# The version of gdbtk we're building. This should be kept
+# in sync with GDBTK_VERSION and friends in gdbtk.h.
+GDBTK_VERSION = 1.0
+GDBTK_LIBRARY = $(datadir)/insight$(GDBTK_VERSION)
+
SUBDIR_GDBTK_OBS = \
gdbtk.o gdbtk-bp.o gdbtk-cmds.o gdbtk-hooks.o \
gdbtk-register.o gdbtk-stack.o gdbtk-varobj.o gdbtk-wrapper.o
@@ -278,8 +283,8 @@ SUBDIR_GDBTK_DEPS = \
SUBDIR_GDBTK_INITS = gdbtk/generic/gdbtk.c
SUBDIR_GDBTK_LDFLAGS=
SUBDIR_GDBTK_CFLAGS= -DGDBTK
-SUBDIR_GDBTK_ALL= all-gdbtk
-SUBDIR_GDBTK_CLEAN= clean-gdbtk
+SUBDIR_GDBTK_ALL=
+SUBDIR_GDBTK_CLEAN=
SUBDIR_GDBTK_INSTALL= install-gdbtk
SUBDIR_GDBTK_UNINSTALL=
@@ -774,7 +779,7 @@ uninstall: force $(CONFIG_UNINSTALL)
true ; \
fi ; \
rm -f $(bindir)/$$transformed_name$(EXEEXT) $(man1dir)/$$transformed_name.1
- rm -rf $(datadir)/gdbtcl
+ rm -rf $(GDBTK_LIBRARY)
@$(MAKE) DO=uninstall "DODIRS=$(SUBDIRS)" $(FLAGS_TO_PASS) subdir_do
# We do this by grepping through sources. If that turns out to be too slow,
@@ -1364,39 +1369,18 @@ regcache.o: regcache.c $(defs_h) $(infer
fork-child.o: fork-child.c gdb_wait.h $(defs_h) $(gdbcore_h) \
$(inferior_h) $(target_h) terminal.h $(gdbthread_h) $(gdb_string_h)
-# FIXME: cagney/2000-03-27: Post 5.0 this link code can be removed.
-# It should now be possible to run GDBtk from the build directory
-# without the link in place.
-all-gdbtk:
- @if test ! -d gdbtcl/images ; then \
- if test "$(LN_S)" = "ln -s" ; then \
- echo linking ${srcdir}/gdbtk/library to gdbtcl ; \
- rm -f gdbtcl ; \
- test ! -r gdbtcl || exit 1 ; \
- $(LN_S) ${srcdir}/gdbtk/library gdbtcl ; \
- else \
- echo "Warning:" ; \
- echo "Unable to link ${srcdir}/gdbtk/library to gdbtcl." ; \
- echo "You will need to do a \`make install' before you are" ; \
- echo "able to run the GUI." ; \
- fi ; \
- else true ; fi
-
-clean-gdbtk:
- rm -f gdbtcl
-
install-gdbtk:
- $(SHELL) $(srcdir)/../mkinstalldirs $(datadir)/gdbtcl ; \
+ $(SHELL) $(srcdir)/../mkinstalldirs $(GDBTK_LIBRARY) ; \
$(SHELL) $(srcdir)/../mkinstalldirs \
- $(datadir)/gdbtcl/images \
- $(datadir)/gdbtcl/images2 ; \
- $(SHELL) $(srcdir)/../mkinstalldirs $(datadir)/gdbtcl/help \
- $(datadir)/gdbtcl/help/images \
- $(datadir)/gdbtcl/help/trace ; \
+ $(GDBTK_LIBRARY)/images \
+ $(GDBTK_LIBRARY)/images2 ; \
+ $(SHELL) $(srcdir)/../mkinstalldirs $(GDBTK_LIBRARY)/help \
+ $(GDBTK_LIBRARY)/help/images \
+ $(GDBTK_LIBRARY)/help/trace ; \
cd $(srcdir)/gdbtk/library ; \
for i in *.tcl *.itcl *.ith *.itb images/*.gif images2/*.gif images/icons.txt images2/icons.txt tclIndex help/*.html help/trace/*.html help/trace/index.toc help/images/*.gif; \
do \
- $(INSTALL_DATA) $$i $(datadir)/gdbtcl/$$i ; \
+ $(INSTALL_DATA) $$i $(GDBTK_LIBRARY)/$$i ; \
done ;
gdbres.o: $(srcdir)/gdbtk/gdb.rc $(srcdir)/gdbtk/gdbtool.ico
@@ -1410,7 +1394,8 @@ gdbtk.o: $(srcdir)/gdbtk/generic/gdbtk.c
$(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS) \
$(ITK_CFLAGS) $(TIX_CFLAGS) \
$(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS) $(GDBTK_CFLAGS)\
- $(srcdir)/gdbtk/generic/gdbtk.c -DGDBTK_LIBRARY=\"$(datadir)/gdbtcl\"
+ $(srcdir)/gdbtk/generic/gdbtk.c \
+ -DGDBTK_LIBRARY=\"$(GDBTK_LIBRARY)\" -DSRC_DIR=\"$(srcdir)\"
gdbtk-bp.o: $(srcdir)/gdbtk/generic/gdbtk-bp.c \
$(srcdir)/gdbtk/generic/gdbtk.h $(srcdir)/gdbtk/generic/gdbtk-cmds.h \
@@ -1418,7 +1403,7 @@ gdbtk-bp.o: $(srcdir)/gdbtk/generic/gdbt
$(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS) \
$(TIX_CFLAGS) $(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS) \
$(GDBTK_CFLAGS) $(srcdir)/gdbtk/generic/gdbtk-bp.c \
- -DGDBTK_LIBRARY=\"$(datadir)/gdbtcl\"
+ -DGDBTK_LIBRARY=\"$(GDBTK_LIBRARY)\"
gdbtk-cmds.o: $(srcdir)/gdbtk/generic/gdbtk-cmds.c \
$(srcdir)/gdbtk/generic/gdbtk.h $(srcdir)/gdbtk/generic/gdbtk-cmds.h \
@@ -1428,7 +1413,7 @@ gdbtk-cmds.o: $(srcdir)/gdbtk/generic/gd
$(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS) \
$(TIX_CFLAGS) $(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS) \
$(GDBTK_CFLAGS) $(srcdir)/gdbtk/generic/gdbtk-cmds.c \
- -DGDBTK_LIBRARY=\"$(datadir)/gdbtcl\"
+ -DGDBTK_LIBRARY=\"$(GDBTK_LIBRARY)\"
gdbtk-hooks.o: $(srcdir)/gdbtk/generic/gdbtk-hooks.c \
$(srcdir)/gdbtk/generic/gdbtk.h $(defs_h) \
@@ -1436,7 +1421,7 @@ gdbtk-hooks.o: $(srcdir)/gdbtk/generic/g
$(bfd_h) $(symfile_h) objfiles.h $(target_h) $(gdb_string_h) $(tracepoint_h)
$(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS) $(TIX_CFLAGS) \
$(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS) $(GDBTK_CFLAGS)\
- $(srcdir)/gdbtk/generic/gdbtk-hooks.c -DGDBTK_LIBRARY=\"$(datadir)/gdbtcl\"
+ $(srcdir)/gdbtk/generic/gdbtk-hooks.c -DGDBTK_LIBRARY=\"$(GDBTK_LIBRARY)\"
gdbtk-register.o: $(srcdir)/gdbtk/generic/gdbtk-register.c \
$(srcdir)/gdbtk/generic/gdbtk.h $(srcdir)/gdbtk/generic/gdbtk-cmds.h \
@@ -1444,7 +1429,7 @@ gdbtk-register.o: $(srcdir)/gdbtk/generi
$(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS) \
$(TIX_CFLAGS) $(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS) \
$(GDBTK_CFLAGS) $(srcdir)/gdbtk/generic/gdbtk-register.c \
- -DGDBTK_LIBRARY=\"$(datadir)/gdbtcl\"
+ -DGDBTK_LIBRARY=\"$(GDBTK_LIBRARY)\"
gdbtk-stack.o: $(srcdir)/gdbtk/generic/gdbtk-stack.c \
$(srcdir)/gdbtk/generic/gdbtk.h $(srcdir)/gdbtk/generic/gdbtk-cmds.h \
@@ -1454,7 +1439,7 @@ gdbtk-stack.o: $(srcdir)/gdbtk/generic/g
$(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS) \
$(TIX_CFLAGS) $(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS) \
$(GDBTK_CFLAGS) $(srcdir)/gdbtk/generic/gdbtk-stack.c \
- -DGDBTK_LIBRARY=\"$(datadir)/gdbtcl\"
+ -DGDBTK_LIBRARY=\"$(GDBTK_LIBRARY)\"
gdbtk-varobj.o: $(srcdir)/gdbtk/generic/gdbtk-varobj.c \
$(srcdir)/gdbtk/generic/gdbtk.h \
reply other threads:[~2001-08-15 13:25 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.GSO.4.33.0108151301550.25893-100000@makita.cygnus.com \
--to=keiths@cygnus.com \
--cc=gdb-patches@sources.redhat.com \
--cc=insight@sources.redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).