This is the mail archive of the binutils@sources.redhat.com mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

fix re-re-re-configure


Committed to src and gcc-bib.

2002-12-06  DJ Delorie  <dj@redhat.com>

	* Makefile.tpl: Change configure dependencies to not have real
	targets depend on phony targets.

Index: Makefile.tpl
===================================================================
RCS file: /cvs/src/src/Makefile.tpl,v
retrieving revision 1.23
diff -p -3 -r1.23 Makefile.tpl
*** Makefile.tpl	5 Dec 2002 18:34:48 -0000	1.23
--- Makefile.tpl	6 Dec 2002 20:11:11 -0000
*************** gcc-no-fixedincludes:
*** 1272,1278 ****
  
  # Host modules specific to gcc.
  # GCC needs to identify certain tools.
! gcc/Makefile: maybe-configure-binutils maybe-configure-gas maybe-configure-ld maybe-configure-bison maybe-configure-flex
  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.
--- 1272,1278 ----
  
  # Host modules specific to gcc.
  # GCC needs to identify certain tools.
! configure-gcc: maybe-configure-binutils maybe-configure-gas maybe-configure-ld maybe-configure-bison maybe-configure-flex
  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-bootstrap: maybe-all-libiberty maybe
*** 1281,1287 ****
  
  # Host modules specific to gdb.
  # GDB needs to know that the simulator is being built.
! gdb/Makefile: maybe-configure-tcl maybe-configure-tk maybe-configure-sim
  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
--- 1281,1287 ----
  
  # Host modules specific to gdb.
  # GDB needs to know that the simulator is being built.
! configure-gdb: maybe-configure-tcl maybe-configure-tk maybe-configure-sim
  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
*************** libgui/Makefile: maybe-configure-tcl may
*** 1289,1295 ****
  all-libgui: maybe-all-tcl maybe-all-tk maybe-all-itcl
  
  # Host modules specific to binutils.
! bfd/Makefile: configure-libiberty
  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
  # We put install-opcodes before install-binutils because the installed
--- 1289,1295 ----
  all-libgui: maybe-all-tcl maybe-all-tk maybe-all-itcl
  
  # Host modules specific to binutils.
! configure-bfd: configure-libiberty
  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
  # We put install-opcodes before install-binutils because the installed
*************** all-opcodes: maybe-all-bfd maybe-all-lib
*** 1303,1311 ****
  
  # Other host modules in the 'src' repository.
  all-dejagnu: maybe-all-tcl maybe-all-expect maybe-all-tk
! expect/Makefile: maybe-configure-tcl maybe-configure-tk
  all-expect: maybe-all-tcl maybe-all-tk
! itcl/Makefile: maybe-configure-tcl maybe-configure-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.
--- 1303,1311 ----
  
  # Other host modules in the 'src' repository.
  all-dejagnu: maybe-all-tcl maybe-all-expect maybe-all-tk
! configure-expect: maybe-configure-tcl maybe-configure-tk
  all-expect: maybe-all-tcl maybe-all-tk
! configure-itcl: maybe-configure-tcl maybe-configure-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
*** 1313,1321 ****
  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
! tk/Makefile: maybe-configure-tcl
  all-tk: maybe-all-tcl
! tix/Makefile: maybe-configure-tcl maybe-configure-tk
  all-tix: maybe-all-tcl maybe-all-tk
  all-texinfo: maybe-all-libiberty
  
--- 1313,1321 ----
  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
! configure-tk: maybe-configure-tcl
  all-tk: maybe-all-tcl
! configure-tix: maybe-configure-tcl maybe-configure-tk
  all-tix: maybe-all-tcl maybe-all-tk
  all-texinfo: maybe-all-libiberty
  
*************** ALL_GCC_C = $(ALL_GCC) maybe-all-target-
*** 1347,1380 ****
  ALL_GCC_CXX = $(ALL_GCC_C) maybe-all-target-libstdc++-v3
  
  # Target modules specific to gcc.
! $(TARGET_SUBDIR)/boehm-gc/Makefile: $(ALL_GCC_C) maybe-configure-target-qthreads
! $(TARGET_SUBDIR)/fastjar/Makefile: maybe-configure-target-zlib
  all-target-fastjar: maybe-all-target-zlib maybe-all-target-libiberty
! $(TARGET_SUBDIR)/libf2c/Makefile: $(ALL_GCC_C)
  all-target-libf2c: maybe-all-target-libiberty
! $(TARGET_SUBDIR)/libffi/Makefile: $(ALL_GCC_C) 
! $(TARGET_SUBDIR)/libjava/Makefile: $(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
! $(TARGET_SUBDIR)/libobjc/Makefile: $(ALL_GCC_C)
  all-target-libobjc: maybe-all-target-libiberty
! $(TARGET_SUBDIR)/libstdc++-v3/Makefile: $(ALL_GCC_C)
  all-target-libstdc++-v3: maybe-all-target-libiberty
! $(TARGET_SUBDIR)/zlib/Makefile: $(ALL_GCC_C)
  
  # Target modules in the 'src' repository.
! $(TARGET_SUBDIR)/examples/Makefile: $(ALL_GCC_C)
! $(TARGET_SUBDIR)/libgloss/Makefile: $(ALL_GCC)
  all-target-libgloss: maybe-configure-target-newlib
! $(TARGET_SUBDIR)/libiberty/Makefile: $(ALL_GCC_C)
! $(TARGET_SUBDIR)/libtermcap/Makefile: $(ALL_GCC_C)
! $(TARGET_SUBDIR)/newlib/Makefile: $(ALL_GCC)
! $(TARGET_SUBDIR)/winsup/Makefile: $(ALL_GCC_C)
  all-target-winsup: maybe-all-target-libiberty maybe-all-target-libtermcap
  
  # Other target modules.  Warning, these are not well tested.
! $(TARGET_SUBDIR)/gperf/Makefile: $(ALL_GCC_CXX)
  all-target-gperf: maybe-all-target-libiberty maybe-all-target-libstdc++-v3
! $(TARGET_SUBDIR)/qthreads/Makefile: $(ALL_GCC_C)
  
  # Dependencies of maybe-foo on foo.  These are used because, for example,
  # all-gcc only depends on all-gas if gas is present and being configured.
--- 1347,1380 ----
  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-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)
  
  # 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
  
  # 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 maybe-foo on foo.  These are used because, for example,
  # all-gcc only depends on all-gas if gas is present and being configured.
Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/Makefile.in,v
retrieving revision 1.89
diff -p -3 -r1.89 Makefile.in
*** Makefile.in	5 Dec 2002 18:34:48 -0000	1.89
--- Makefile.in	6 Dec 2002 20:11:11 -0000
*************** gcc-no-fixedincludes:
*** 7667,7673 ****
  
  # Host modules specific to gcc.
  # GCC needs to identify certain tools.
! gcc/Makefile: maybe-configure-binutils maybe-configure-gas maybe-configure-ld maybe-configure-bison maybe-configure-flex
  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.
--- 7667,7673 ----
  
  # Host modules specific to gcc.
  # GCC needs to identify certain tools.
! configure-gcc: maybe-configure-binutils maybe-configure-gas maybe-configure-ld maybe-configure-bison maybe-configure-flex
  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-bootstrap: maybe-all-libiberty maybe
*** 7676,7682 ****
  
  # Host modules specific to gdb.
  # GDB needs to know that the simulator is being built.
! gdb/Makefile: maybe-configure-tcl maybe-configure-tk maybe-configure-sim
  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
--- 7676,7682 ----
  
  # Host modules specific to gdb.
  # GDB needs to know that the simulator is being built.
! configure-gdb: maybe-configure-tcl maybe-configure-tk maybe-configure-sim
  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
*************** libgui/Makefile: maybe-configure-tcl may
*** 7684,7690 ****
  all-libgui: maybe-all-tcl maybe-all-tk maybe-all-itcl
  
  # Host modules specific to binutils.
! bfd/Makefile: configure-libiberty
  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
  # We put install-opcodes before install-binutils because the installed
--- 7684,7690 ----
  all-libgui: maybe-all-tcl maybe-all-tk maybe-all-itcl
  
  # Host modules specific to binutils.
! configure-bfd: configure-libiberty
  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
  # We put install-opcodes before install-binutils because the installed
*************** all-opcodes: maybe-all-bfd maybe-all-lib
*** 7698,7706 ****
  
  # Other host modules in the 'src' repository.
  all-dejagnu: maybe-all-tcl maybe-all-expect maybe-all-tk
! expect/Makefile: maybe-configure-tcl maybe-configure-tk
  all-expect: maybe-all-tcl maybe-all-tk
! itcl/Makefile: maybe-configure-tcl maybe-configure-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.
--- 7698,7706 ----
  
  # Other host modules in the 'src' repository.
  all-dejagnu: maybe-all-tcl maybe-all-expect maybe-all-tk
! configure-expect: maybe-configure-tcl maybe-configure-tk
  all-expect: maybe-all-tcl maybe-all-tk
! configure-itcl: maybe-configure-tcl maybe-configure-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
*** 7708,7716 ****
  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
! tk/Makefile: maybe-configure-tcl
  all-tk: maybe-all-tcl
! tix/Makefile: maybe-configure-tcl maybe-configure-tk
  all-tix: maybe-all-tcl maybe-all-tk
  all-texinfo: maybe-all-libiberty
  
--- 7708,7716 ----
  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
! configure-tk: maybe-configure-tcl
  all-tk: maybe-all-tcl
! configure-tix: maybe-configure-tcl maybe-configure-tk
  all-tix: maybe-all-tcl maybe-all-tk
  all-texinfo: maybe-all-libiberty
  
*************** ALL_GCC_C = $(ALL_GCC) maybe-all-target-
*** 7742,7775 ****
  ALL_GCC_CXX = $(ALL_GCC_C) maybe-all-target-libstdc++-v3
  
  # Target modules specific to gcc.
! $(TARGET_SUBDIR)/boehm-gc/Makefile: $(ALL_GCC_C) maybe-configure-target-qthreads
! $(TARGET_SUBDIR)/fastjar/Makefile: maybe-configure-target-zlib
  all-target-fastjar: maybe-all-target-zlib maybe-all-target-libiberty
! $(TARGET_SUBDIR)/libf2c/Makefile: $(ALL_GCC_C)
  all-target-libf2c: maybe-all-target-libiberty
! $(TARGET_SUBDIR)/libffi/Makefile: $(ALL_GCC_C) 
! $(TARGET_SUBDIR)/libjava/Makefile: $(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
! $(TARGET_SUBDIR)/libobjc/Makefile: $(ALL_GCC_C)
  all-target-libobjc: maybe-all-target-libiberty
! $(TARGET_SUBDIR)/libstdc++-v3/Makefile: $(ALL_GCC_C)
  all-target-libstdc++-v3: maybe-all-target-libiberty
! $(TARGET_SUBDIR)/zlib/Makefile: $(ALL_GCC_C)
  
  # Target modules in the 'src' repository.
! $(TARGET_SUBDIR)/examples/Makefile: $(ALL_GCC_C)
! $(TARGET_SUBDIR)/libgloss/Makefile: $(ALL_GCC)
  all-target-libgloss: maybe-configure-target-newlib
! $(TARGET_SUBDIR)/libiberty/Makefile: $(ALL_GCC_C)
! $(TARGET_SUBDIR)/libtermcap/Makefile: $(ALL_GCC_C)
! $(TARGET_SUBDIR)/newlib/Makefile: $(ALL_GCC)
! $(TARGET_SUBDIR)/winsup/Makefile: $(ALL_GCC_C)
  all-target-winsup: maybe-all-target-libiberty maybe-all-target-libtermcap
  
  # Other target modules.  Warning, these are not well tested.
! $(TARGET_SUBDIR)/gperf/Makefile: $(ALL_GCC_CXX)
  all-target-gperf: maybe-all-target-libiberty maybe-all-target-libstdc++-v3
! $(TARGET_SUBDIR)/qthreads/Makefile: $(ALL_GCC_C)
  
  # Dependencies of maybe-foo on foo.  These are used because, for example,
  # all-gcc only depends on all-gas if gas is present and being configured.
--- 7742,7775 ----
  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-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)
  
  # 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
  
  # 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 maybe-foo on foo.  These are used because, for example,
  # all-gcc only depends on all-gas if gas is present and being configured.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]