From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16214 invoked by alias); 30 Nov 2002 14:15:05 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 16197 invoked from network); 30 Nov 2002 14:15:03 -0000 Received: from unknown (HELO mailout5-0.nyroc.rr.com) (24.92.226.169) by sources.redhat.com with SMTP; 30 Nov 2002 14:15:03 -0000 Received: from doctormoo (syr-24-24-16-193.twcny.rr.com [24.24.16.193]) by mailout5-0.nyroc.rr.com (8.11.6/RoadRunner 1.20) with ESMTP id gAUEF0F07555; Sat, 30 Nov 2002 09:15:00 -0500 (EST) Received: from neroden by doctormoo with local (Exim 3.36 #1 (Debian)) id 18I8Ny-00006d-00; Sat, 30 Nov 2002 09:14:22 -0500 Date: Sat, 30 Nov 2002 06:15:00 -0000 To: gcc-patches@gcc.gnu.org, gdb-patches@sources.redhat.com, binutils@sources.redhat.com, dj@redhat.com Subject: (toplevel patch) Dependency tidy. Message-ID: <20021130141421.GA408@doctormoo> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4i From: Nathanael Nerode X-SW-Source: 2002-11/txt/msg00759.txt.bz2 In light of what I know now, this rearranges dependencies in the order which is actually the most convenient, and adds a certain number of comments. The diff is only useful to verify that for each line I removed I added it elsewhere; the fulltext shows what it will look like. DJ, this is now number two on my (new) outstanding patch list, after the de-vault patch. * Makefile.tpl: Reorder and comment dependencies. * Makefile.in: Regenerate. Index: Makefile.tpl =================================================================== RCS file: /cvs/gcc/gcc/Makefile.tpl,v retrieving revision 1.5.2.17 diff -u -r1.5.2.17 Makefile.tpl --- Makefile.tpl 26 Nov 2002 20:07:21 -0000 1.5.2.17 +++ Makefile.tpl 30 Nov 2002 14:09:59 -0000 @@ -1172,90 +1172,112 @@ true; \ fi -ALL_GCC = maybe-all-gcc -ALL_GCC_C = $(ALL_GCC) maybe-all-target-newlib maybe-all-target-libgloss -ALL_GCC_CXX = $(ALL_GCC_C) maybe-all-target-libstdc++-v3 +# -------------------------------------- +# Dependencies between different modules +# -------------------------------------- -# This is a list of inter-dependencies among modules. -all-autoconf: maybe-all-m4 maybe-all-texinfo -all-automake: maybe-all-m4 maybe-all-texinfo +# There are two types of dependencies here: 'hard' dependencies, where one +# module simply won't build without the other; and 'soft' dependencies, where +# if the depended-on module is missing, the depending module will do without +# or find a substitute somewhere (perhaps installed). Soft dependencies +# are specified by depending on a 'maybe-' target. If you're not sure, +# it's safer to use a soft dependency. + +# Host modules specific to gcc. +all-gcc: maybe-all-libiberty maybe-all-bison maybe-all-byacc maybe-all-binutils maybe-all-gas maybe-all-ld maybe-all-zlib +# This is a slightly kludgy method of getting dependencies on +# all-build-libiberty correct; it would be better to build it every time. +all-gcc: maybe-all-build-libiberty +all-bootstrap: maybe-all-libiberty maybe-all-texinfo maybe-all-bison maybe-all-byacc maybe-all-binutils maybe-all-gas maybe-all-ld maybe-all-zlib + +# Host modules specific to gdb. +GDB_TK = @GDB_TK@ +all-gdb: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-mmalloc maybe-all-readline maybe-all-bison maybe-all-byacc maybe-all-sim $(gdbnlmrequirements) $(GDB_TK) +install-gdb: maybe-install-tcl maybe-install-tk maybe-install-itcl maybe-install-tix maybe-install-libgui +all-libgui: maybe-all-tcl maybe-all-tk maybe-all-itcl + +# Host modules specific to binutils. all-bfd: maybe-all-libiberty maybe-all-intl all-binutils: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-flex maybe-all-bison maybe-all-byacc maybe-all-intl -all-bison: maybe-all-texinfo -configure-target-boehm-gc: $(ALL_GCC_C) maybe-configure-target-qthreads +# We put install-opcodes before install-binutils because the installed +# binutils might be on PATH, and they might need the shared opcodes +# library. +install-binutils: maybe-install-opcodes +all-gas: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-intl +all-gprof: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-intl +all-ld: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-bison maybe-all-byacc maybe-all-flex maybe-all-intl +all-opcodes: maybe-all-bfd maybe-all-libiberty + +# Other host modules in the 'src' repository. all-dejagnu: maybe-all-tcl maybe-all-expect maybe-all-tk -all-diff: maybe-all-libiberty -configure-target-examples: $(ALL_GCC_C) all-expect: maybe-all-tcl maybe-all-tk +all-itcl: maybe-all-tcl maybe-all-tk +# We put install-tcl before install-itcl because itcl wants to run a +# program on installation which uses the Tcl libraries. +install-itcl: maybe-install-tcl +all-sid: maybe-all-tcl maybe-all-tk +install-sid: maybe-install-tcl maybe-install-tk +all-sim: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-readline +all-tk: maybe-all-tcl +all-tix: maybe-all-tcl maybe-all-tk +all-texinfo: maybe-all-libiberty + +# Other host modules. Warning, these are not well tested. +all-autoconf: maybe-all-m4 maybe-all-texinfo +all-automake: maybe-all-m4 maybe-all-texinfo +all-bison: maybe-all-texinfo +all-diff: maybe-all-libiberty +all-fastjar: maybe-all-zlib maybe-all-libiberty all-fileutils: maybe-all-libiberty all-flex: maybe-all-libiberty maybe-all-bison maybe-all-byacc -all-gas: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-intl -all-gcc: maybe-all-libiberty maybe-all-bison maybe-all-byacc maybe-all-binutils maybe-all-gas maybe-all-ld maybe-all-zlib -all-bootstrap: maybe-all-libiberty maybe-all-texinfo maybe-all-bison maybe-all-byacc maybe-all-binutils maybe-all-gas maybe-all-ld maybe-all-zlib -GDB_TK = @GDB_TK@ -all-gdb: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-mmalloc maybe-all-readline maybe-all-bison maybe-all-byacc maybe-all-sim $(gdbnlmrequirements) $(GDB_TK) -configure-target-gperf: $(ALL_GCC_CXX) -all-target-gperf: maybe-all-target-libiberty maybe-all-target-libstdc++-v3 -all-gprof: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-intl all-grep: maybe-all-libiberty all-gzip: maybe-all-libiberty all-hello: maybe-all-libiberty -all-itcl: maybe-all-tcl maybe-all-tk -all-ld: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-bison maybe-all-byacc maybe-all-flex maybe-all-intl -configure-target-libgloss: $(ALL_GCC) -all-target-libgloss: maybe-configure-target-newlib -all-libgui: maybe-all-tcl maybe-all-tk maybe-all-itcl -configure-target-libffi: $(ALL_GCC_C) -configure-target-libjava: $(ALL_GCC_C) maybe-configure-target-zlib maybe-configure-target-boehm-gc maybe-configure-target-qthreads maybe-configure-target-libffi -all-target-libjava: maybe-all-fastjar maybe-all-target-zlib maybe-all-target-boehm-gc maybe-all-target-qthreads maybe-all-target-libffi -configure-target-libstdc++-v3: $(ALL_GCC_C) -all-target-libstdc++-v3: maybe-all-target-libiberty -configure-target-libf2c: $(ALL_GCC_C) -all-target-libf2c: maybe-all-target-libiberty -configure-target-libobjc: $(ALL_GCC_C) -all-target-libobjc: maybe-all-target-libiberty all-m4: maybe-all-libiberty maybe-all-texinfo all-make: maybe-all-libiberty -configure-target-newlib: $(ALL_GCC) -configure-target-libtermcap: $(ALL_GCC_C) -all-opcodes: maybe-all-bfd maybe-all-libiberty all-patch: maybe-all-libiberty all-prms: maybe-all-libiberty -configure-target-qthreads: $(ALL_GCC_C) all-recode: maybe-all-libiberty all-sed: maybe-all-libiberty all-send-pr: maybe-all-prms -all-sid: maybe-all-tcl maybe-all-tk -all-sim: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-readline all-snavigator: maybe-all-tcl maybe-all-tk maybe-all-itcl maybe-all-tix maybe-all-db maybe-all-grep maybe-all-libgui all-tar: maybe-all-libiberty all-tclX: maybe-all-tcl maybe-all-tk -all-tk: maybe-all-tcl -all-texinfo: maybe-all-libiberty -all-tix: maybe-all-tcl maybe-all-tk -configure-target-winsup: $(ALL_GCC_C) -all-target-winsup: maybe-all-target-libiberty maybe-all-target-libtermcap all-uudecode: maybe-all-libiberty -configure-target-zlib: $(ALL_GCC_C) -all-fastjar: maybe-all-zlib maybe-all-libiberty + +ALL_GCC = maybe-all-gcc +ALL_GCC_C = $(ALL_GCC) maybe-all-target-newlib maybe-all-target-libgloss +ALL_GCC_CXX = $(ALL_GCC_C) maybe-all-target-libstdc++-v3 + +# Target modules specific to gcc. +configure-target-boehm-gc: $(ALL_GCC_C) maybe-configure-target-qthreads configure-target-fastjar: maybe-configure-target-zlib all-target-fastjar: maybe-all-target-zlib maybe-all-target-libiberty -configure-target-libiberty: $(ALL_GCC_C) -install-gdb: maybe-install-tcl maybe-install-tk maybe-install-itcl maybe-install-tix maybe-install-libgui -install-sid: maybe-install-tcl maybe-install-tk - -# We put install-opcodes before install-binutils because the installed -# binutils might be on PATH, and they might need the shared opcodes -# library. -install-binutils: maybe-install-opcodes +configure-target-libf2c: $(ALL_GCC_C) +all-target-libf2c: maybe-all-target-libiberty +configure-target-libffi: $(ALL_GCC_C) +configure-target-libjava: $(ALL_GCC_C) maybe-configure-target-zlib maybe-configure-target-boehm-gc maybe-configure-target-qthreads maybe-configure-target-libffi +all-target-libjava: maybe-all-fastjar maybe-all-target-zlib maybe-all-target-boehm-gc maybe-all-target-qthreads maybe-all-target-libffi +configure-target-libobjc: $(ALL_GCC_C) +all-target-libobjc: maybe-all-target-libiberty +configure-target-libstdc++-v3: $(ALL_GCC_C) +all-target-libstdc++-v3: maybe-all-target-libiberty +configure-target-zlib: $(ALL_GCC_C) -# We put install-tcl before install-itcl because itcl wants to run a -# program on installation which uses the Tcl libraries. -install-itcl: maybe-install-tcl +# Target modules in the 'src' repository. +configure-target-examples: $(ALL_GCC_C) +configure-target-libgloss: $(ALL_GCC) +all-target-libgloss: maybe-configure-target-newlib +configure-target-libiberty: $(ALL_GCC_C) +configure-target-libtermcap: $(ALL_GCC_C) +configure-target-newlib: $(ALL_GCC) +configure-target-winsup: $(ALL_GCC_C) +all-target-winsup: maybe-all-target-libiberty maybe-all-target-libtermcap -# This is a slightly kludgy method of getting dependencies on -# all-build-libiberty correct; it would be better to build it every time. -all-gcc: maybe-all-build-libiberty +# Other target modules. Warning, these are not well tested. +configure-target-gperf: $(ALL_GCC_CXX) +all-target-gperf: maybe-all-target-libiberty maybe-all-target-libstdc++-v3 +configure-target-qthreads: $(ALL_GCC_C) # Dependencies of all-build-foo on configure-build-foo. [+ FOR build_modules +]all-build-[+module+]: configure-build-[+module+]