From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17309 invoked by alias); 25 Jul 2008 20:50:57 -0000 Received: (qmail 17297 invoked by uid 22791); 25 Jul 2008 20:50:54 -0000 X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (66.187.233.31) by sourceware.org (qpsmtpd/0.31) with ESMTP; Fri, 25 Jul 2008 20:50:26 +0000 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id m6PKoHOt020639 for ; Fri, 25 Jul 2008 16:50:24 -0400 Received: from pobox.corp.redhat.com (pobox.corp.redhat.com [10.11.255.20]) by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id m6PKoHlg032222 for ; Fri, 25 Jul 2008 16:50:17 -0400 Received: from lindt.uglyboxes.com (sebastian-int.corp.redhat.com [172.16.52.221]) by pobox.corp.redhat.com (8.13.1/8.13.1) with ESMTP id m6PKoDSr030363 for ; Fri, 25 Jul 2008 16:50:14 -0400 Message-ID: <488A3C85.4000506@redhat.com> Date: Fri, 25 Jul 2008 20:50:00 -0000 From: Keith Seitz User-Agent: Thunderbird 2.0.0.14 (X11/20080421) MIME-Version: 1.0 To: gdb-patches@sourceware.org Subject: [RFA] Gdbtk configury changes Content-Type: multipart/mixed; boundary="------------020803030507080004060704" X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2008-07/txt/msg00454.txt.bz2 This is a multi-part message in MIME format. --------------020803030507080004060704 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-length: 1408 Hi, I know that I probably don't need to post this, but the affected files are really owned by gdb, so I wanted to make sure that everyone is aware of what is going on. For reasons unknown to me, I have been working on eliminating the need for Tcl, Tk, and Itcl to come from the source tree. I need to tweak the gdbtk-related configury and build to support this change. All of my changes are only in portions of the affected files that deal specifically with gdbtk. I would appreciate it if a global maintainer would quickly peruse this and make sure I am not about to bork something up. It has been quite some time since I've hacked on configury and Makefiles. Keith ChangeLog 2008-07-25 Keith Seitz * acinclude.m4: Include ../config/tcl.m4 to pick up standard Tcl configury bits. Remove all Tcl, Tk, Itcl, Itk, etc definitions. * configure.ac: Don't check if ../itcl exists when building gdbtk. It could be installed. Rewrite gdbtk configury to allow for using system-supplied Tcl and Tk. Gdbtk no longer requires build-time access to itcl and itk. * Makefile.in: Remove everything related to itcl and itk. Rewrite the Tcl bits for gdbtk to correspond to rewrite of configure.ac. (ALL_TCL_CFLAGS): New convenience defintion. Change all gdbtk sources to use it. --------------020803030507080004060704 Content-Type: text/x-patch; name="gdbtk-configury.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="gdbtk-configury.patch" Content-length: 35979 Index: configure.ac =================================================================== RCS file: /cvs/src/src/gdb/configure.ac,v retrieving revision 1.75 diff -u -p -r1.75 configure.ac --- configure.ac 23 Jul 2008 17:40:48 -0000 1.75 +++ configure.ac 25 Jul 2008 20:41:03 -0000 @@ -282,7 +282,7 @@ AC_ARG_ENABLE(gdbtk, *) AC_MSG_ERROR([bad value $enableval for --enable-gdbtk]) ;; esac], - [if test -d $srcdir/gdbtk -a -d $srcdir/../itcl; then + [if test -d $srcdir/gdbtk; then enable_gdbtk=yes else enable_gdbtk=no @@ -1507,57 +1507,71 @@ if test "${enable_gdbtk}" = "yes"; then GDBTK_SRC_DIR=`pwd` cd $here - CY_AC_PATH_TCLCONFIG + SC_PATH_TCLCONFIG if test -z "${no_tcl}"; then - CY_AC_LOAD_TCLCONFIG - CY_AC_PATH_TKCONFIG + SC_LOAD_TCLCONFIG - # now look for Tcl library stuff - - tcldir="../tcl/${configdir}/" - - TCL_DEPS="${tcldir}${TCL_LIB_FILE}" + # Check for in-tree tcl + here=`pwd` + cd ${srcdir}/.. + topdir=`pwd` + cd ${here} + + intree="no" + if test "${TCL_SRC_DIR}" = "${topdir}/tcl"; then + intree="yes" + fi + + # Find Tcl private headers + if test x"${intree}" = xno; then + CY_AC_TCL_PRIVATE_HEADERS + TCL_INCLUDE="${TCL_INCLUDE_SPEC} ${TCL_PRIVATE_INCLUDE}" + TCL_LIBRARY="${TCL_LIB_SPEC}" + TCL_DEPS="" + else + # If building tcl in the same src tree, private headers + # are not needed, but we need to be sure to use the right + # headers library + TCL_INCLUDE="-I${TCL_SRC_DIR}/generic" + TCL_LIBRARY="${TCL_BUILD_LIB_SPEC}" + TCL_DEPS="../tcl/${configdir}${TCL_LIB_FILE}" + fi + AC_SUBST(TCL_INCLUDE) + AC_SUBST(TCL_LIBRARY) + AC_SUBST(TCL_DEPS) # If $no_tk is nonempty, then we can't do Tk, and there is no # point to doing Tcl. if test -z "${no_tk}"; then - CY_AC_LOAD_TKCONFIG - CY_AC_PATH_TCLH - CY_AC_PATH_TKH - CY_AC_PATH_ITCLH - CY_AC_PATH_ITKH - - - # now look for Tk library stuff - - tkdir="../tk/${configdir}/" + SC_PATH_TKCONFIG + SC_LOAD_TKCONFIG - TK_DEPS="${tkdir}${TK_LIB_FILE}" - - # now look for Itcl library stuff - - CY_AC_PATH_ITCLCONFIG - if test -z "${no_itcl}"; then - CY_AC_LOAD_ITCLCONFIG - - ITCLLIB="${ITCL_BUILD_LIB_SPEC}" - ITCL_DEPS="${ITCL_LIB_FULL_PATH}" + # Check for in-tree Tk + intree="no" + if test "${TK_SRC_DIR}" = "${topdir}/tk"; then + intree="yes" fi - - # now look for Itk library stuff - CY_AC_PATH_ITKCONFIG - if test -z "${no_itcl}"; then - CY_AC_LOAD_ITKCONFIG - - ITKLIB="${ITK_BUILD_LIB_SPEC}" - ITK_DEPS="${ITK_LIB_FULL_PATH}" + # Find Tk private headers + if test x"${intree}" = xno; then + CY_AC_TK_PRIVATE_HEADERS + TK_INCLUDE="${TK_INCLUDE_SPEC} ${TK_PRIVATE_INCLUDE}" + TK_LIBRARY=${TK_LIB_SPEC} + TK_DEPS="" + else + TK_INCLUDE="-I${TK_SRC_DIR}/generic" + TK_LIBRARY="${TK_BUILD_LIB_SPEC}" + TK_DEPS="../tk/${configdir}/${TK_LIB_FILE}" fi + AC_SUBST(TK_INCLUDE) + AC_SUBST(TK_LIBRARY) + AC_SUBST(TK_DEPS) + AC_SUBST(TK_XINCLUDES) ENABLE_CFLAGS="${ENABLE_CFLAGS} \$(SUBDIR_GDBTK_CFLAGS)" # Include some libraries that Tcl and Tk want. - TCL_LIBS='$(LIBGUI) $(ITCL) $(ITK) $(TK) $(TCL) $(X11_LDFLAGS) $(X11_LIBS)' + TCL_LIBS='$(LIBGUI) $(TK) $(TCL) $(X11_LDFLAGS) $(X11_LIBS)' # Yes, the ordering seems wrong here. But it isn't. # TK_LIBS is the list of libraries that need to be linked # after Tcl/Tk. Note that this isn't put into LIBS. If it @@ -1587,12 +1601,6 @@ fi AC_SUBST(X_CFLAGS) AC_SUBST(X_LDFLAGS) AC_SUBST(X_LIBS) -AC_SUBST(TCL_DEPS) -AC_SUBST(TK_DEPS) -AC_SUBST(ITCLLIB) -AC_SUBST(ITCL_DEPS) -AC_SUBST(ITKLIB) -AC_SUBST(ITK_DEPS) AC_SUBST(GDBTKLIBS) AC_SUBST(GDBTK_CFLAGS) AC_SUBST(GDBTK_SRC_DIR) Index: acinclude.m4 =================================================================== RCS file: /cvs/src/src/gdb/acinclude.m4,v retrieving revision 1.20 diff -u -p -r1.20 acinclude.m4 --- acinclude.m4 26 Jun 2008 15:51:27 -0000 1.20 +++ acinclude.m4 25 Jul 2008 20:41:03 -0000 @@ -4,7 +4,7 @@ dnl major rewriting for Tcl 7.5 by Don L dnl gdb/configure.in uses BFD_NEED_DECLARATION, so get its definition. sinclude(../bfd/bfd.m4) -dnl This gets the standard macros, like the TCL, TK, etc ones. +dnl This gets the standard macros sinclude(../config/acinclude.m4) dnl This gets autoconf bugfixes @@ -20,6 +20,9 @@ sinclude(../config/lib-link.m4) dnl For ACX_PKGVERSION and ACX_BUGURL. sinclude(../config/acx.m4) +dnl for TCL definitions +sinclude(../config/tcl.m4) + # # Sometimes the native compiler is a bogus stub for gcc or /usr/ucb/cc. This # makes configure think it's cross compiling. If --target wasn't used, then @@ -44,680 +47,12 @@ fi AC_MSG_RESULT(yes) ]) -AC_DEFUN([CY_AC_PATH_TCLH], [ -# -# Ok, lets find the tcl source trees so we can use the headers -# Warning: transition of version 9 to 10 will break this algorithm -# because 10 sorts before 9. We also look for just tcl. We have to -# be careful that we don't match stuff like tclX by accident. -# the alternative search directory is involked by --with-tclinclude -# - -no_tcl=true -AC_MSG_CHECKING(for Tcl private headers. dir=${configdir}) -AC_ARG_WITH(tclinclude, [ --with-tclinclude=DIR Directory where tcl private headers are], with_tclinclude=${withval}) -AC_CACHE_VAL(ac_cv_c_tclh,[ -# first check to see if --with-tclinclude was specified -if test x"${with_tclinclude}" != x ; then - if test -f ${with_tclinclude}/tclInt.h ; then - ac_cv_c_tclh=`(cd ${with_tclinclude}; pwd)` - elif test -f ${with_tclinclude}/generic/tclInt.h ; then - ac_cv_c_tclh=`(cd ${with_tclinclude}/generic; pwd)` - else - AC_MSG_ERROR([${with_tclinclude} directory doesn't contain private headers]) - fi -fi - -# next check if it came with Tcl configuration file -if test x"${ac_cv_c_tclconfig}" = x ; then - if test -f $ac_cv_c_tclconfig/../generic/tclInt.h ; then - ac_cv_c_tclh=`(cd $ac_cv_c_tclconfig/..; pwd)` - fi -fi - -# next check in private source directory -# -# since ls returns lowest version numbers first, reverse its output -if test x"${ac_cv_c_tclh}" = x ; then - for i in \ - ${srcdir}/../tcl \ - `ls -dr ${srcdir}/../tcl[[7-9]]* 2>/dev/null` \ - ${srcdir}/../../tcl \ - `ls -dr ${srcdir}/../../tcl[[7-9]]* 2>/dev/null` \ - ${srcdir}/../../../tcl \ - `ls -dr ${srcdir}/../../../tcl[[7-9]]* 2>/dev/null ` ; do - if test -f $i/generic/tclInt.h ; then - ac_cv_c_tclh=`(cd $i/generic; pwd)` - break - fi - done -fi -# finally check in a few common install locations -# -# since ls returns lowest version numbers first, reverse its output -if test x"${ac_cv_c_tclh}" = x ; then - for i in \ - `ls -dr /usr/local/src/tcl[[7-9]]* 2>/dev/null` \ - `ls -dr /usr/local/lib/tcl[[7-9]]* 2>/dev/null` \ - /usr/local/src/tcl \ - /usr/local/lib/tcl \ - ${prefix}/include ; do - if test -f $i/generic/tclInt.h ; then - ac_cv_c_tclh=`(cd $i/generic; pwd)` - break - fi - done -fi -# see if one is installed -if test x"${ac_cv_c_tclh}" = x ; then - AC_HEADER_CHECK(tclInt.h, ac_cv_c_tclh=installed, ac_cv_c_tclh="") -fi -]) -if test x"${ac_cv_c_tclh}" = x ; then - TCLHDIR="# no Tcl private headers found" - AC_MSG_ERROR([Can't find Tcl private headers]) -fi -if test x"${ac_cv_c_tclh}" != x ; then - no_tcl="" - if test x"${ac_cv_c_tclh}" = x"installed" ; then - AC_MSG_RESULT([is installed]) - TCLHDIR="" - else - AC_MSG_RESULT([found in ${ac_cv_c_tclh}]) - # this hack is cause the TCLHDIR won't print if there is a "-I" in it. - TCLHDIR="-I${ac_cv_c_tclh}" - fi -fi - -AC_SUBST(TCLHDIR) -]) - - -AC_DEFUN([CY_AC_PATH_TCLCONFIG], [ -# -# Ok, lets find the tcl configuration -# First, look for one uninstalled. -# the alternative search directory is invoked by --with-tclconfig -# - -if test x"${no_tcl}" = x ; then - # we reset no_tcl in case something fails here - no_tcl=true - AC_ARG_WITH(tclconfig, [ --with-tclconfig=DIR Directory containing tcl configuration (tclConfig.sh)], - with_tclconfig=${withval}) - AC_MSG_CHECKING([for Tcl configuration]) - AC_CACHE_VAL(ac_cv_c_tclconfig,[ - - # First check to see if --with-tclconfig was specified. - if test x"${with_tclconfig}" != x ; then - if test -f "${with_tclconfig}/tclConfig.sh" ; then - ac_cv_c_tclconfig=`(cd ${with_tclconfig}; pwd)` - else - AC_MSG_ERROR([${with_tclconfig} directory doesn't contain tclConfig.sh]) - fi - fi - - # then check for a private Tcl installation - if test x"${ac_cv_c_tclconfig}" = x ; then - for i in \ - ../tcl \ - `ls -dr ../tcl[[7-9]]* 2>/dev/null` \ - ../../tcl \ - `ls -dr ../../tcl[[7-9]]* 2>/dev/null` \ - ../../../tcl \ - `ls -dr ../../../tcl[[7-9]]* 2>/dev/null` ; do - if test -f "$i/${configdir}/tclConfig.sh" ; then - ac_cv_c_tclconfig=`(cd $i/${configdir}; pwd)` - break - fi - done - fi - # check in a few common install locations - if test x"${ac_cv_c_tclconfig}" = x ; then - for i in `ls -d ${prefix}/lib /usr/local/lib 2>/dev/null` ; do - if test -f "$i/tclConfig.sh" ; then - ac_cv_c_tclconfig=`(cd $i; pwd)` - break - fi - done - fi - # check in a few other private locations - if test x"${ac_cv_c_tclconfig}" = x ; then - for i in \ - ${srcdir}/../tcl \ - `ls -dr ${srcdir}/../tcl[[7-9]]* 2>/dev/null` ; do - if test -f "$i/${configdir}/tclConfig.sh" ; then - ac_cv_c_tclconfig=`(cd $i/${configdir}; pwd)` - break - fi - done - fi - ]) - if test x"${ac_cv_c_tclconfig}" = x ; then - TCLCONFIG="# no Tcl configs found" - AC_MSG_WARN(Can't find Tcl configuration definitions) - else - no_tcl= - TCLCONFIG=${ac_cv_c_tclconfig}/tclConfig.sh - AC_MSG_RESULT(found $TCLCONFIG) - fi -fi -]) - -# Defined as a separate macro so we don't have to cache the values -# from PATH_TCLCONFIG (because this can also be cached). -AC_DEFUN([CY_AC_LOAD_TCLCONFIG], [ - . $TCLCONFIG - - AC_SUBST(TCL_VERSION) - AC_SUBST(TCL_MAJOR_VERSION) - AC_SUBST(TCL_MINOR_VERSION) - AC_SUBST(TCL_CC) - AC_SUBST(TCL_DEFS) - -dnl not used, don't export to save symbols -dnl AC_SUBST(TCL_LIB_FILE) - -dnl don't export, not used outside of configure -dnl AC_SUBST(TCL_LIBS) -dnl not used, don't export to save symbols -dnl AC_SUBST(TCL_PREFIX) - -dnl not used, don't export to save symbols -dnl AC_SUBST(TCL_EXEC_PREFIX) - - AC_SUBST(TCL_SHLIB_CFLAGS) - AC_SUBST(TCL_SHLIB_LD) -dnl don't export, not used outside of configure - AC_SUBST(TCL_SHLIB_LD_LIBS) - AC_SUBST(TCL_SHLIB_SUFFIX) -dnl not used, don't export to save symbols - AC_SUBST(TCL_DL_LIBS) - AC_SUBST(TCL_LD_FLAGS) -dnl don't export, not used outside of configure - AC_SUBST(TCL_LD_SEARCH_FLAGS) - AC_SUBST(TCL_CC_SEARCH_FLAGS) - AC_SUBST(TCL_COMPAT_OBJS) - AC_SUBST(TCL_RANLIB) - AC_SUBST(TCL_BUILD_LIB_SPEC) - AC_SUBST(TCL_LIB_SPEC) - AC_SUBST(TCL_LIB_VERSIONS_OK) - -dnl not used, don't export to save symbols -dnl AC_SUBST(TCL_SHARED_LIB_SUFFIX) - -dnl not used, don't export to save symbols -dnl AC_SUBST(TCL_UNSHARED_LIB_SUFFIX) -]) - -# Warning: Tk definitions are very similar to Tcl definitions but -# are not precisely the same. There are a couple of differences, -# so don't do changes to Tcl thinking you can cut and paste it do -# the Tk differences and later simply substitute "Tk" for "Tcl". -# Known differences: -# - Acceptable Tcl major version #s is 7-9 while Tk is 4-9 -# - Searching for Tcl includes looking for tclInt.h, Tk looks for tk.h -# - Computing major/minor versions is different because Tk depends on -# headers to Tcl, Tk, and X. -# - Symbols in tkConfig.sh are different than tclConfig.sh -# - Acceptable for Tk to be missing but not Tcl. - -AC_DEFUN([CY_AC_PATH_TKH], [ -# -# Ok, lets find the tk source trees so we can use the headers -# If the directory (presumably symlink) named "tk" exists, use that one -# in preference to any others. Same logic is used when choosing library -# and again with Tcl. The search order is the best place to look first, then in -# decreasing significance. The loop breaks if the trigger file is found. -# Note the gross little conversion here of srcdir by cd'ing to the found -# directory. This converts the path from a relative to an absolute, so -# recursive cache variables for the path will work right. We check all -# the possible paths in one loop rather than many seperate loops to speed -# things up. -# the alternative search directory is involked by --with-tkinclude -# -no_tk=true -AC_MSG_CHECKING(for Tk private headers) -AC_ARG_WITH(tkinclude, [ --with-tkinclude=DIR Directory where tk private headers are], with_tkinclude=${withval}) -AC_CACHE_VAL(ac_cv_c_tkh,[ -# first check to see if --with-tkinclude was specified -if test x"${with_tkinclude}" != x ; then - if test -f ${with_tkinclude}/tk.h ; then - ac_cv_c_tkh=`(cd ${with_tkinclude}; pwd)` - elif test -f ${with_tkinclude}/generic/tk.h ; then - ac_cv_c_tkh=`(cd ${with_tkinclude}/generic; pwd)` - else - AC_MSG_ERROR([${with_tkinclude} directory doesn't contain private headers]) - fi -fi - -# next check if it came with Tk configuration file -if test x"${ac_cv_c_tkconfig}" = x ; then - if test -f $ac_cv_c_tkconfig/../generic/tk.h ; then - ac_cv_c_tkh=`(cd $ac_cv_c_tkconfig/..; pwd)` - fi -fi - -# next check in private source directory -# -# since ls returns lowest version numbers first, reverse its output -if test x"${ac_cv_c_tkh}" = x ; then - for i in \ - ${srcdir}/../tk \ - `ls -dr ${srcdir}/../tk[[4-9]]* 2>/dev/null` \ - ${srcdir}/../../tk \ - `ls -dr ${srcdir}/../../tk[[4-9]]* 2>/dev/null` \ - ${srcdir}/../../../tk \ - `ls -dr ${srcdir}/../../../tk[[4-9]]* 2>/dev/null ` ; do - if test -f $i/generic/tk.h ; then - ac_cv_c_tkh=`(cd $i/generic; pwd)` - break - fi - done -fi -# finally check in a few common install locations -# -# since ls returns lowest version numbers first, reverse its output -if test x"${ac_cv_c_tkh}" = x ; then - for i in \ - `ls -dr /usr/local/src/tk[[4-9]]* 2>/dev/null` \ - `ls -dr /usr/local/lib/tk[[4-9]]* 2>/dev/null` \ - /usr/local/src/tk \ - /usr/local/lib/tk \ - ${prefix}/include ; do - if test -f $i/generic/tk.h ; then - ac_cv_c_tkh=`(cd $i/generic; pwd)` - break - fi - done -fi -# see if one is installed -if test x"${ac_cv_c_tkh}" = x ; then - AC_HEADER_CHECK(tk.h, ac_cv_c_tkh=installed, ac_cv_c_tkh="") -fi -]) -if test x"${ac_cv_c_tkh}" != x ; then - no_tk="" - if test x"${ac_cv_c_tkh}" = x"installed" ; then - AC_MSG_RESULT([is installed]) - TKHDIR="" - else - AC_MSG_RESULT([found in ${ac_cv_c_tkh}]) - # this hack is cause the TKHDIR won't print if there is a "-I" in it. - TKHDIR="-I${ac_cv_c_tkh}" - fi -else - TKHDIR="# no Tk directory found" - AC_MSG_WARN([Can't find Tk private headers]) - no_tk=true -fi - -AC_SUBST(TKHDIR) -]) - - -AC_DEFUN([CY_AC_PATH_TKCONFIG], [ -# -# Ok, lets find the tk configuration -# First, look for one uninstalled. -# the alternative search directory is invoked by --with-tkconfig -# - -if test x"${no_tk}" = x ; then - # we reset no_tk in case something fails here - no_tk=true - AC_ARG_WITH(tkconfig, [ --with-tkconfig=DIR Directory containing tk configuration (tkConfig.sh)], - with_tkconfig=${withval}) - AC_MSG_CHECKING([for Tk configuration]) - AC_CACHE_VAL(ac_cv_c_tkconfig,[ - - # First check to see if --with-tkconfig was specified. - if test x"${with_tkconfig}" != x ; then - if test -f "${with_tkconfig}/tkConfig.sh" ; then - ac_cv_c_tkconfig=`(cd ${with_tkconfig}; pwd)` - else - AC_MSG_ERROR([${with_tkconfig} directory doesn't contain tkConfig.sh]) - fi - fi - - # then check for a private Tk library - if test x"${ac_cv_c_tkconfig}" = x ; then - for i in \ - ../tk \ - `ls -dr ../tk[[4-9]]* 2>/dev/null` \ - ../../tk \ - `ls -dr ../../tk[[4-9]]* 2>/dev/null` \ - ../../../tk \ - `ls -dr ../../../tk[[4-9]]* 2>/dev/null` ; do - if test -f "$i/${configdir}/tkConfig.sh" ; then - ac_cv_c_tkconfig=`(cd $i/${configdir}; pwd)` - break - fi - done - fi - # check in a few common install locations - if test x"${ac_cv_c_tkconfig}" = x ; then - for i in `ls -d ${prefix}/lib /usr/local/lib 2>/dev/null` ; do - if test -f "$i/tkConfig.sh" ; then - ac_cv_c_tkconfig=`(cd $i; pwd)` - break - fi - done - fi - # check in a few other private locations - if test x"${ac_cv_c_tkconfig}" = x ; then - for i in \ - ${srcdir}/../tk \ - `ls -dr ${srcdir}/../tk[[4-9]]* 2>/dev/null` ; do - if test -f "$i/${configdir}/tkConfig.sh" ; then - ac_cv_c_tkconfig=`(cd $i/${configdir}; pwd)` - break - fi - done - fi - ]) - if test x"${ac_cv_c_tkconfig}" = x ; then - TKCONFIG="# no Tk configs found" - AC_MSG_WARN(Can't find Tk configuration definitions) - else - no_tk= - TKCONFIG=${ac_cv_c_tkconfig}/tkConfig.sh - AC_MSG_RESULT(found $TKCONFIG) - fi -fi - -]) - -# Defined as a separate macro so we don't have to cache the values -# from PATH_TKCONFIG (because this can also be cached). -AC_DEFUN([CY_AC_LOAD_TKCONFIG], [ - if test -f "$TKCONFIG" ; then - . $TKCONFIG - fi - - AC_SUBST(TK_VERSION) -dnl not actually used, don't export to save symbols -dnl AC_SUBST(TK_MAJOR_VERSION) -dnl AC_SUBST(TK_MINOR_VERSION) - AC_SUBST(TK_DEFS) - -dnl not used, don't export to save symbols - dnl AC_SUBST(TK_LIB_FILE) - -dnl not used outside of configure -dnl AC_SUBST(TK_LIBS) -dnl not used, don't export to save symbols -dnl AC_SUBST(TK_PREFIX) - -dnl not used, don't export to save symbols -dnl AC_SUBST(TK_EXEC_PREFIX) - - AC_SUBST(TK_BUILD_INCLUDES) - AC_SUBST(TK_XINCLUDES) - AC_SUBST(TK_XLIBSW) - AC_SUBST(TK_BUILD_LIB_SPEC) - AC_SUBST(TK_LIB_SPEC) -]) - -# check for Itcl headers. - -AC_DEFUN([CY_AC_PATH_ITCLCONFIG], [ -# -# Ok, lets find the itcl configuration -# First, look for one uninstalled. -# the alternative search directory is invoked by --with-itclconfig -# - -if test x"${no_itcl}" = x ; then - # we reset no_itcl in case something fails here - no_itcl=true - AC_ARG_WITH(itclconfig, [ --with-itclconfig Directory containing itcl configuration (itclConfig.sh)], - with_itclconfig=${withval}) - AC_MSG_CHECKING([for Itcl configuration]) - AC_CACHE_VAL(ac_cv_c_itclconfig,[ - - # First check to see if --with-itclconfig was specified. - if test x"${with_itclconfig}" != x ; then - if test -f "${with_itclconfig}/itclConfig.sh" ; then - ac_cv_c_itclconfig=`(cd ${with_itclconfig}; pwd)` - else - AC_MSG_ERROR([${with_itclconfig} directory doesn't contain itclConfig.sh]) - fi - fi - - # then check for a private Itcl library - if test x"${ac_cv_c_itclconfig}" = x ; then - for i in \ - ../itcl/itcl \ - `ls -dr ../itcl[[4-9]]*/itcl 2>/dev/null` \ - ../../itcl \ - `ls -dr ../../itcl[[4-9]]*/itcl 2>/dev/null` \ - ../../../itcl \ - `ls -dr ../../../itcl[[4-9]]*/itcl 2>/dev/null` ; do - if test -f "$i/itclConfig.sh" ; then - ac_cv_c_itclconfig=`(cd $i; pwd)` - break - fi - done - fi - # check in a few common install locations - if test x"${ac_cv_c_itclconfig}" = x ; then - for i in `ls -d ${prefix}/lib /usr/local/lib 2>/dev/null` ; do - if test -f "$i/itclConfig.sh" ; then - ac_cv_c_itclconfig=`(cd $i; pwd)` - break - fi - done - fi - # check in a few other private locations - if test x"${ac_cv_c_itclconfig}" = x ; then - for i in \ - ${srcdir}/../itcl/itcl \ - `ls -dr ${srcdir}/../itcl[[4-9]]*/itcl 2>/dev/null` ; do - if test -f "$i/itclConfig.sh" ; then - ac_cv_c_itclconfig=`(cd $i; pwd)` - break - fi - done - fi - ]) - if test x"${ac_cv_c_itclconfig}" = x ; then - ITCLCONFIG="# no Itcl configs found" - AC_MSG_WARN(Can't find Itcl configuration definitions) - else - no_itcl= - ITCLCONFIG=${ac_cv_c_itclconfig}/itclConfig.sh - AC_MSG_RESULT(found $ITCLCONFIG) - fi -fi -]) - -# Defined as a separate macro so we don't have to cache the values -# from PATH_ITCLCONFIG (because this can also be cached). -AC_DEFUN([CY_AC_LOAD_ITCLCONFIG], [ - if test -f "$ITCLCONFIG" ; then - . $ITCLCONFIG - fi - - AC_SUBST(ITCL_VERSION) -dnl not actually used, don't export to save symbols -dnl AC_SUBST(ITCL_MAJOR_VERSION) -dnl AC_SUBST(ITCL_MINOR_VERSION) - AC_SUBST(ITCL_DEFS) - -dnl not used, don't export to save symbols - dnl AC_SUBST(ITCL_LIB_FILE) - -dnl not used outside of configure -dnl AC_SUBST(ITCL_LIBS) -dnl not used, don't export to save symbols -dnl AC_SUBST(ITCL_PREFIX) - -dnl not used, don't export to save symbols -dnl AC_SUBST(ITCL_EXEC_PREFIX) - - AC_SUBST(ITCL_BUILD_INCLUDES) - AC_SUBST(ITCL_BUILD_LIB_SPEC) - AC_SUBST(ITCL_LIB_SPEC) -]) - -# check for Itcl headers. - -AC_DEFUN([CY_AC_PATH_ITCLH], [ -AC_MSG_CHECKING(for Itcl private headers. srcdir=${srcdir}) -if test x"${ac_cv_c_itclh}" = x ; then - for i in ${srcdir}/../itcl ${srcdir}/../../itcl ${srcdir}/../../../itcl ${srcdir}/../itcl/itcl; do - if test -f $i/generic/itcl.h ; then - ac_cv_c_itclh=`(cd $i/generic; pwd)` - break - fi - done -fi -if test x"${ac_cv_c_itclh}" = x ; then - ITCLHDIR="# no Itcl private headers found" - AC_MSG_ERROR([Can't find Itcl private headers]) -fi -if test x"${ac_cv_c_itclh}" != x ; then - ITCLHDIR="-I${ac_cv_c_itclh}" -fi -# should always be here -# ITCLLIB="../itcl/itcl/unix/libitcl.a" -AC_SUBST(ITCLHDIR) -#AC_SUBST(ITCLLIB) -]) - - -AC_DEFUN([CY_AC_PATH_ITKCONFIG], [ -# -# Ok, lets find the itk configuration -# First, look for one uninstalled. -# the alternative search directory is invoked by --with-itkconfig -# - -if test x"${no_itk}" = x ; then - # we reset no_itk in case something fails here - no_itk=true - AC_ARG_WITH(itkconfig, [ --with-itkconfig Directory containing itk configuration (itkConfig.sh)], - with_itkconfig=${withval}) - AC_MSG_CHECKING([for Itk configuration]) - AC_CACHE_VAL(ac_cv_c_itkconfig,[ - - # First check to see if --with-itkconfig was specified. - if test x"${with_itkconfig}" != x ; then - if test -f "${with_itkconfig}/itkConfig.sh" ; then - ac_cv_c_itkconfig=`(cd ${with_itkconfig}; pwd)` - else - AC_MSG_ERROR([${with_itkconfig} directory doesn't contain itkConfig.sh]) - fi - fi - - # then check for a private Itk library - if test x"${ac_cv_c_itkconfig}" = x ; then - for i in \ - ../itcl/itk \ - `ls -dr ../itcl[[4-9]]*/itk 2>/dev/null` \ - ../../itk \ - `ls -dr ../../itcl[[4-9]]*/itk 2>/dev/null` \ - ../../../itk \ - `ls -dr ../../../itcl[[4-9]]*/itk 2>/dev/null` ; do - if test -f "$i/itkConfig.sh" ; then - ac_cv_c_itkconfig=`(cd $i; pwd)` - break - fi - done - fi - # check in a few common install locations - if test x"${ac_cv_c_itkconfig}" = x ; then - for i in `ls -d ${prefix}/lib /usr/local/lib 2>/dev/null` ; do - if test -f "$i/itkConfig.sh" ; then - ac_cv_c_itkconfig=`(cd $i; pwd)` - break - fi - done - fi - # check in a few other private locations - if test x"${ac_cv_c_itkconfig}" = x ; then - for i in \ - ${srcdir}/../itcl/itk \ - `ls -dr ${srcdir}/../itcl[[4-9]]*/itk 2>/dev/null` ; do - if test -f "$i/itkConfig.sh" ; then - ac_cv_c_itkconfig=`(cd $i; pwd)` - break - fi - done - fi - ]) - if test x"${ac_cv_c_itkconfig}" = x ; then - ITKCONFIG="# no Itk configs found" - AC_MSG_WARN(Can't find Itk configuration definitions) - else - no_itk= - ITKCONFIG=${ac_cv_c_itkconfig}/itkConfig.sh - AC_MSG_RESULT(found $ITKCONFIG) - fi -fi - -]) - -# Defined as a separate macro so we don't have to cache the values -# from PATH_ITKCONFIG (because this can also be cached). -AC_DEFUN([CY_AC_LOAD_ITKCONFIG], [ - if test -f "$ITKCONFIG" ; then - . $ITKCONFIG - fi - - AC_SUBST(ITK_VERSION) -dnl not actually used, don't export to save symbols -dnl AC_SUBST(ITK_MAJOR_VERSION) -dnl AC_SUBST(ITK_MINOR_VERSION) - AC_SUBST(ITK_DEFS) - -dnl not used, don't export to save symbols - dnl AC_SUBST(ITK_LIB_FILE) - -dnl not used outside of configure -dnl AC_SUBST(ITK_LIBS) -dnl not used, don't export to save symbols -dnl AC_SUBST(ITK_PREFIX) - -dnl not used, don't export to save symbols -dnl AC_SUBST(ITK_EXEC_PREFIX) - - AC_SUBST(ITK_BUILD_INCLUDES) - AC_SUBST(ITK_BUILD_LIB_SPEC) - AC_SUBST(ITK_LIB_SPEC) -]) - -AC_DEFUN([CY_AC_PATH_ITKH], [ -AC_MSG_CHECKING(for Itk private headers. srcdir=${srcdir}) -if test x"${ac_cv_c_itkh}" = x ; then - for i in ${srcdir}/../itcl ${srcdir}/../../itcl ${srcdir}/../../../itcl ${srcdir}/../itcl/itk; do - if test -f $i/generic/itk.h ; then - ac_cv_c_itkh=`(cd $i/generic; pwd)` - break - fi - done -fi -if test x"${ac_cv_c_itkh}" = x ; then - ITKHDIR="# no Itk private headers found" - AC_MSG_ERROR([Can't find Itk private headers]) -fi -if test x"${ac_cv_c_itkh}" != x ; then - ITKHDIR="-I${ac_cv_c_itkh}" -fi -# should always be here -# ITKLIB="../itcl/itk/unix/libitk.a" -AC_SUBST(ITKHDIR) -#AC_SUBST(ITKLIB) -]) - - ## ----------------------------------------- ## ## ANSIfy the C compiler whenever possible. ## ## From Franc,ois Pinard ## ## ----------------------------------------- ## -# Copyright (C) 1996, 1997, 1999, 2000, 2001 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2008 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -957,3 +292,44 @@ if test x = y ; then fi ]) +dnl Find the location of the private Tcl headers +dnl When Tcl is installed, this is TCL_INCLUDE_SPEC/tcl-private/generic +dnl When Tcl is in the build tree, this is not needed. +dnl +dnl Note: you must use first use SC_LOAD_TCLCONFIG! +AC_DEFUN([CY_AC_TCL_PRIVATE_HEADERS], [ + AC_MSG_CHECKING([for Tcl private headers]) + private_dir="" + dir=`echo ${TCL_INCLUDE_SPEC}/tcl-private/generic | sed -e s/-I//` + if test -f ${dir}/tclInt.h ; then + private_dir=${dir} + fi + + if test x"${private_dir}" = x; then + AC_ERROR(could not find private Tcl headers) + else + TCL_PRIVATE_INCLUDE="-I${private_dir}" + AC_MSG_RESULT(${private_dir}) + fi +]) + +dnl Find the location of the private Tk headers +dnl When Tk is installed, this is TK_INCLUDE_SPEC/tk-private/generic +dnl When Tk is in the build tree, this not needed. +dnl +dnl Note: you must first use SC_LOAD_TKCONFIG +AC_DEFUN([CY_AC_TK_PRIVATE_HEADERS], [ + AC_MSG_CHECKING([for Tk private headers]) + private_dir="" + dir=`echo ${TK_INCLUDE_SPEC}/tk-private/generic | sed -e s/-I//` + if test -f ${dir}/tkInt.h; then + private_dir=${dir} + fi + + if test x"${private_dir}" = x; then + AC_ERROR(could not find Tk private headers) + else + TK_PRIVATE_INCLUDE="-I${private_dir}" + AC_MSG_RESULT(${private_dir}) + fi +]) Index: Makefile.in =================================================================== RCS file: /cvs/src/src/gdb/Makefile.in,v retrieving revision 1.1040 diff -u -p -r1.1040 Makefile.in --- Makefile.in 25 Jul 2008 16:12:02 -0000 1.1040 +++ Makefile.in 25 Jul 2008 20:41:05 -0000 @@ -274,27 +274,15 @@ SIM = @SIM@ WIN32LIBS = @WIN32LIBS@ -# Where is the TCL library? Typically in ../tcl. -LIB_INSTALL_DIR = $(libdir) -# This variable is needed when doing dynamic linking. -LIB_RUNTIME_DIR = $(libdir) -TCL = @TCL_CC_SEARCH_FLAGS@ @TCL_BUILD_LIB_SPEC@ -TCL_CFLAGS = @TCLHDIR@ +# Tcl et al cflags and libraries +TCL = @TCL_LIBRARY@ +TCL_CFLAGS = @TCL_INCLUDE@ GDBTKLIBS = @GDBTKLIBS@ # Extra flags that the GDBTK files need: GDBTK_CFLAGS = @GDBTK_CFLAGS@ -# Where is the TK library? Typically in ../tk. -TK = @TK_BUILD_LIB_SPEC@ -TK_CFLAGS = @TKHDIR@ @TK_BUILD_INCLUDES@ - -# Where is Itcl? Typically in ../itcl/itcl. -ITCL_CFLAGS = @ITCLHDIR@ -ITCL = @ITCLLIB@ - -# Where is Itk? Typically in ../itcl/itk. -ITK_CFLAGS = @ITKHDIR@ -ITK = @ITKLIB@ +TK = @TK_LIBRARY@ +TK_CFLAGS = @TK_INCLUDE@ X11_CFLAGS = @TK_XINCLUDES@ X11_LDFLAGS = @@ -306,6 +294,8 @@ LIBGUI = @LIBGUI@ GUI_CFLAGS_X = @GUI_CFLAGS_X@ IDE_CFLAGS=$(GUI_CFLAGS_X) $(IDE_CFLAGS_X) +ALL_TCL_CFLAGS = $(TCL_CFLAGS) $(TK_CFLAGS) + # 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 @@ -325,8 +315,7 @@ SUBDIR_GDBTK_SRCS = \ gdbtk/generic/gdbtk-register.c gdbtk/generic/gdbtk-stack.c \ gdbtk/generic/gdbtk-varobj.c gdbtk/generic/gdbtk-wrapper.c \ gdbtk/generic/gdbtk-main.c -SUBDIR_GDBTK_DEPS = \ - $(LIBGUI) $(ITCL_DEPS) $(ITK_DEPS) $(TK_DEPS) $(TCL_DEPS) +SUBDIR_GDBTK_DEPS = $(LIBGUI) $(TCL_DEPS) $(TK_DEPS) SUBDIR_GDBTK_LDFLAGS= SUBDIR_GDBTK_CFLAGS= -DGDBTK @@ -1663,9 +1652,8 @@ procfs.o: $(srcdir)/procfs.c $(CC) -c $(INTERNAL_WARN_CFLAGS) $(srcdir)/procfs.c v850ice.o: $(srcdir)/v850ice.c - $(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS) \ - $(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS) \ - $(GDBTK_CFLAGS) \ + $(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ALL_TCL_CFLAGS) \ + $(X11_CFLAGS) $(GDBTK_CFLAGS) \ $(srcdir)/v850ice.c # Message files. Based on code in gcc/Makefile.in. @@ -3134,13 +3122,12 @@ gdbres.o: $(srcdir)/gdbtk/gdb.rc $(srcdi $(WINDRES) --include $(srcdir)/gdbtk $(srcdir)/gdbtk/gdb.rc gdbres.o gdbtk.o: $(srcdir)/gdbtk/generic/gdbtk.c \ - $(srcdir)/gdbtk/generic/gdbtk.h $(defs_h) \ - $(symtab_h) $(inferior_h) $(command_h) \ - $(bfd_h) $(symfile_h) $(objfiles_h) $(target_h) $(gdb_string_h) \ - $(tracepoint_h) $(top_h) - $(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS) \ - $(ITK_CFLAGS) \ - $(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS) $(GDBTK_CFLAGS)\ + $(srcdir)/gdbtk/generic/gdbtk.h $(defs_h) \ + $(symtab_h) $(inferior_h) $(command_h) \ + $(bfd_h) $(symfile_h) $(objfiles_h) $(target_h) \ + $(gdb_string_h) $(tracepoint_h) $(top_h) + $(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ALL_TCL_CFLAGS) \ + $(X11_CFLAGS) $(GDBTK_CFLAGS)\ $(srcdir)/gdbtk/generic/gdbtk.c \ -DGDBTK_LIBRARY=\"$(GDBTK_LIBRARY)\" -DSRC_DIR=\"$(GDBTK_SRC_DIR)\" @@ -3149,70 +3136,74 @@ gdbtk-bp.o: $(srcdir)/gdbtk/generic/gdbt $(srcdir)/gdbtk/generic/gdbtk-cmds.h \ $(defs_h) $(breakpoint_h) $(tracepoint_h) \ $(symfile_h) $(symtab_h) $(gdb_string_h) $(observer_h) - $(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS) \ - $(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS) \ - $(GDBTK_CFLAGS) $(srcdir)/gdbtk/generic/gdbtk-bp.c \ - -DGDBTK_LIBRARY=\"$(GDBTK_LIBRARY)\" + $(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ALL_TCL_CFLAGS) \ + $(X11_CFLAGS) $(GDBTK_CFLAGS) \ + $(srcdir)/gdbtk/generic/gdbtk-bp.c \ + -DGDBTK_LIBRARY=\"$(GDBTK_LIBRARY)\" gdbtk-cmds.o: $(srcdir)/gdbtk/generic/gdbtk-cmds.c \ - $(srcdir)/gdbtk/generic/gdbtk.h $(srcdir)/gdbtk/generic/gdbtk-cmds.h \ - $(defs_h) $(inferior_h) $(source_h) $(symfile_h) $(objfiles_h) \ - $(gdbcore_h) $(demangle_h) $(linespec_h) $(tui_file_h) $(top_h) \ - $(annotate_h) $(block_h) $(dictionary_h) $(gdb_string_h) \ - $(dis_asm_h) $(gdbcmd_h) $(varobj_h) - $(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS) \ - $(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS) \ - $(GDBTK_CFLAGS) $(srcdir)/gdbtk/generic/gdbtk-cmds.c \ - -DGDBTK_LIBRARY=\"$(GDBTK_LIBRARY)\" + $(srcdir)/gdbtk/generic/gdbtk.h \ + $(srcdir)/gdbtk/generic/gdbtk-cmds.h \ + $(defs_h) $(inferior_h) $(source_h) $(symfile_h) \ + $(objfiles_h) $(gdbcore_h) $(demangle_h) $(linespec_h) \ + $(tui_file_h) $(top_h) $(annotate_h) $(block_h) \ + $(dictionary_h) $(gdb_string_h) $(dis_asm_h) $(gdbcmd_h) \ + $(varobj_h) + $(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ALL_TCL_CFLAGS) \ + $(X11_CFLAGS) $(GDBTK_CFLAGS) \ + $(srcdir)/gdbtk/generic/gdbtk-cmds.c \ + -DGDBTK_LIBRARY=\"$(GDBTK_LIBRARY)\" gdbtk-hooks.o: $(srcdir)/gdbtk/generic/gdbtk-hooks.c \ - $(srcdir)/gdbtk/generic/gdbtk.h $(defs_h) \ - $(symtab_h) $(inferior_h) $(command_h) \ - $(bfd_h) $(symfile_h) $(objfiles_h) $(target_h) $(gdb_string_h) \ - $(tracepoint_h) $(observer_h) - $(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS) \ - $(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS) $(GDBTK_CFLAGS)\ - $(srcdir)/gdbtk/generic/gdbtk-hooks.c -DGDBTK_LIBRARY=\"$(GDBTK_LIBRARY)\" + $(srcdir)/gdbtk/generic/gdbtk.h $(defs_h) \ + $(symtab_h) $(inferior_h) $(command_h) \ + $(bfd_h) $(symfile_h) $(objfiles_h) $(target_h) \ + $(gdb_string_h) $(tracepoint_h) $(observer_h) + $(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ALL_TCL_CFLAGS) \ + $(X11_CFLAGS) $(GDBTK_CFLAGS)\ + $(srcdir)/gdbtk/generic/gdbtk-hooks.c \ + -DGDBTK_LIBRARY=\"$(GDBTK_LIBRARY)\" gdbtk-interp.o: $(srcdir)/gdbtk/generic/gdbtk-interp.c \ - $(defs_h) $(interps_h) $(ui_out_h) $(ui_file_h) \ - $(cli_out_h) $(gdb_string_h) $(cli_cmds_h) $(cli_decode_h) \ - $(srcdir)/gdbtk/generic/gdbtk.h - $(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS) \ - $(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS) $(GDBTK_CFLAGS) \ + $(defs_h) $(interps_h) $(ui_out_h) $(ui_file_h) \ + $(cli_out_h) $(gdb_string_h) $(cli_cmds_h) $(cli_decode_h) \ + $(srcdir)/gdbtk/generic/gdbtk.h + $(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ALL_TCL_CFLAGS) \ + $(X11_CFLAGS) $(GDBTK_CFLAGS) \ $(srcdir)/gdbtk/generic/gdbtk-interp.c gdbtk-main.o: $(srcdir)/gdbtk/generic/gdbtk-main.c $(defs_h) $(main_h) \ - $(gdb_string_h) - $(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS) \ - $(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS) $(GDBTK_CFLAGS)\ - $(srcdir)/gdbtk/generic/gdbtk-main.c -DGDBTK_LIBRARY=\"$(GDBTK_LIBRARY)\" + $(gdb_string_h) + $(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ALL_TCL_CFLAGS) \ + $(X11_CFLAGS) $(GDBTK_CFLAGS)\ + $(srcdir)/gdbtk/generic/gdbtk-main.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 \ $(defs_h) $(frame_h) $(value_h) $(gdb_string_h) - $(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS) \ - $(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS) \ - $(GDBTK_CFLAGS) $(srcdir)/gdbtk/generic/gdbtk-register.c \ - -DGDBTK_LIBRARY=\"$(GDBTK_LIBRARY)\" + $(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ALL_TCL_CFLAGS) \ + $(X11_CFLAGS) \ + $(GDBTK_CFLAGS) $(srcdir)/gdbtk/generic/gdbtk-register.c \ + -DGDBTK_LIBRARY=\"$(GDBTK_LIBRARY)\" gdbtk-stack.o: $(srcdir)/gdbtk/generic/gdbtk-stack.c \ $(srcdir)/gdbtk/generic/gdbtk.h $(srcdir)/gdbtk/generic/gdbtk-cmds.h \ $(srcdir)/gdbtk/generic/gdbtk-wrapper.h \ $(defs_h) $(target_h) $(breakpoint_h) $(linespec_h) \ $(block_h) $(dictionary_h) $(varobj_h) - $(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS) \ - $(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS) \ - $(GDBTK_CFLAGS) $(srcdir)/gdbtk/generic/gdbtk-stack.c \ - -DGDBTK_LIBRARY=\"$(GDBTK_LIBRARY)\" + $(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ALL_TCL_CFLAGS) \ + $(X11_CFLAGS) $(GDBTK_CFLAGS) \ + $(srcdir)/gdbtk/generic/gdbtk-stack.c \ + -DGDBTK_LIBRARY=\"$(GDBTK_LIBRARY)\" gdbtk-varobj.o: $(srcdir)/gdbtk/generic/gdbtk-varobj.c \ $(srcdir)/gdbtk/generic/gdbtk.h \ $(srcdir)/gdbtk/generic/gdbtk-wrapper.h \ $(defs_h) $(value_h) $(varobj_h) $(gdb_string_h) - $(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ITCL_CFLAGS) \ - $(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS) $(GDBTK_CFLAGS)\ + $(CC) -c $(INTERNAL_CFLAGS) $(IDE_CFLAGS) $(ALL_TCL_CFLAGS) \ + $(X11_CFLAGS) $(GDBTK_CFLAGS) \ $(srcdir)/gdbtk/generic/gdbtk-varobj.c gdbtk-wrapper.o: $(srcdir)/gdbtk/generic/gdbtk-wrapper.c \ --------------020803030507080004060704--