From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 28806 invoked by alias); 3 Jan 2003 19:23:39 -0000 Mailing-List: contact insight-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: insight-owner@sources.redhat.com Received: (qmail 28743 invoked from network); 3 Jan 2003 19:23:37 -0000 Received: from unknown (HELO localhost.redhat.com) (66.30.197.194) by 209.249.29.67 with SMTP; 3 Jan 2003 19:23:37 -0000 Received: from redhat.com (localhost [127.0.0.1]) by localhost.redhat.com (Postfix) with ESMTP id 27DD33DC3; Fri, 3 Jan 2003 14:23:25 -0500 (EST) Message-ID: <3E15E32C.2050405@redhat.com> Date: Fri, 03 Jan 2003 19:23:00 -0000 From: Andrew Cagney User-Agent: Mozilla/5.0 (X11; U; NetBSD macppc; en-US; rv:1.0.1) Gecko/20021211 X-Accept-Language: en-us, en MIME-Version: 1.0 To: gcc-patches@gcc.gnu.org Cc: insight@sources.redhat.com, gdb-patches@sources.redhat.com Subject: [rfa/toplevel] Conditionalize GDB_TK Content-Type: multipart/mixed; boundary="------------080906070809080702090603" X-SW-Source: 2003-q1/txt/msg00000.txt.bz2 This is a multi-part message in MIME format. --------------080906070809080702090603 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Content-length: 322 Hello, The attatched only adds the tk directories to the gdb dependency list when the corresponding tk files are present. That way `all-gdb' doesn't build tk files (except when needed). ok? Andrew PS: Disclaimer, I cut/paste the configure changes. Perhaphs someone able to regenerate configure should commit this? --------------080906070809080702090603 Content-Type: text/plain; name="diffs" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="diffs" Content-length: 2369 2003-01-03 Andrew Cagney * configure.in (GDB_TK): Add tcl directories conditional on gdb/gdbtk directory being present. * configure: Regenerate. Index: configure =================================================================== RCS file: /cvs/src/src/configure,v retrieving revision 1.40 diff -u -r1.40 configure --- configure 31 Dec 2002 18:00:11 -0000 1.40 +++ configure 3 Jan 2003 17:48:45 -0000 @@ -2334,11 +2334,23 @@ # so we should be able to put the 'maybe's in unconditionally and # leave out the maybe dependencies when enable_gdbtk is false. I'm not # 100% sure that that's safe though. + +gdb_tk="maybe-all-tcl maybe-all-tk maybe-all-itcl maybe-all-tix maybe-all-libgui" case "$enable_gdbtk" in no) GDB_TK="" ;; + yes) + GDB_TK="${gdb_tk}" ;; *) - GDB_TK="maybe-all-tcl maybe-all-tk maybe-all-itcl maybe-all-tix maybe-all-libgui" ;; + # Only add the dependency on gdbtk when GDBtk is part of the gdb + # distro. Eventually someone will fix this and move Insight, nee + # gdbtk to a separate directory. + if test -d ${srcdir}/gdb/gdbtk ; then + GDB_TK="${gdb_tk}" + else + GDB_TK="" + fi + ;; esac # Create the 'maybe dependencies'. This uses a temporary file. Index: configure.in =================================================================== RCS file: /cvs/src/src/configure.in,v retrieving revision 1.137 diff -u -r1.137 configure.in --- configure.in 31 Dec 2002 18:00:11 -0000 1.137 +++ configure.in 3 Jan 2003 17:48:45 -0000 @@ -1677,11 +1677,23 @@ # so we should be able to put the 'maybe's in unconditionally and # leave out the maybe dependencies when enable_gdbtk is false. I'm not # 100% sure that that's safe though. + +gdb_tk="maybe-all-tcl maybe-all-tk maybe-all-itcl maybe-all-tix maybe-all-libgui" case "$enable_gdbtk" in no) GDB_TK="" ;; + yes) + GDB_TK="${gdb_tk}" ;; *) - GDB_TK="maybe-all-tcl maybe-all-tk maybe-all-itcl maybe-all-tix maybe-all-libgui" ;; + # Only add the dependency on gdbtk when GDBtk is part of the gdb + # distro. Eventually someone will fix this and move Insight, nee + # gdbtk to a separate directory. + if test -d ${srcdir}/gdb/gdbtk ; then + GDB_TK="${gdb_tk}" + else + GDB_TK="" + fi + ;; esac # Create the 'maybe dependencies'. This uses a temporary file. --------------080906070809080702090603--