Mirror of the gdb-patches mailing list
 help / color / mirror / Atom feed
* top level: make more dependencies explicit
@ 2002-09-29  9:56 Nathanael Nerode
  2002-09-29 10:09 ` Andrew Cagney
  2002-09-30  9:49 ` top level: make more dependencies explicit DJ Delorie
  0 siblings, 2 replies; 11+ messages in thread
From: Nathanael Nerode @ 2002-09-29  9:56 UTC (permalink / raw)
  To: gcc-patches, binutils, gdb-patches, dj

This puts in explicit dependencies in place of dependencies
embedded in ordering.  Tested on i686-pc-linux-gnu, seems to work.

2002-09-29  Nathanael Nerode  <neroden@gcc.gnu.org>

	* Makefile.def: Remove order dependency comments.
	* Makefile.tpl: Add explicit install-install dependencies.
	* Makefile.in: Regenerate.

Index: Makefile.def
===================================================================
RCS file: /cvs/gcc/gcc/Makefile.def,v
retrieving revision 1.2
diff -u -3 -r1.2 Makefile.def
--- Makefile.def	25 Sep 2002 16:49:39 -0000	1.2
+++ Makefile.def	29 Sep 2002 16:48:22 -0000
@@ -6,7 +6,6 @@
 host_modules= { module= automake; };
 host_modules= { module= bash; };
 host_modules= { module= bfd; };
-// Put install-opcodes before install-binutils: should be Makefile dependency.
 host_modules= { module= opcodes; };
 host_modules= { module= binutils; };
 host_modules= { module= bison; no_check_cross= true; };
@@ -32,7 +31,6 @@
 host_modules= { module= hello; };
 host_modules= { module= indent; };
 host_modules= { module= intl; };
-// Put install-tcl before install-itcl: should be Makefile dependency.
 host_modules= { module= tcl; };
 host_modules= { module= itcl; };
 host_modules= { module= ld; };
Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/Makefile.in,v
retrieving revision 1.117
diff -u -3 -r1.117 Makefile.in
--- Makefile.in	29 Sep 2002 15:53:23 -0000	1.117
+++ Makefile.in	29 Sep 2002 16:48:24 -0000
@@ -656,11 +656,6 @@
 
 # This is a list of the install targets for all of the modules which are
 # compiled using $(FLAGS_TO_PASS).
-# We put install-opcodes before install-binutils because the installed
-# binutils might be on PATH, and they might need the shared opcodes
-# library.
-# We put install-tcl before install-itcl because itcl wants to run a
-# program on installation which uses the Tcl libraries.
 INSTALL_MODULES = \
 	install-ash \
 	install-autoconf \
@@ -1747,6 +1742,16 @@
 install-target: $(INSTALL_TARGET_MODULES)
 install-gdb: install-tcl install-tk install-itcl install-tix install-libgui
 install-sid: install-tcl 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: install-opcodes
+
+# We put install-tcl before install-itcl because itcl wants to run a
+# program on installation which uses the Tcl libraries.
+install-itcl: install-tcl
+
 
 # Dependencies of all-target-foo on configure-target-foo.
 all-target-libstdc++-v3: configure-target-libstdc++-v3
Index: Makefile.tpl
===================================================================
RCS file: /cvs/gcc/gcc/Makefile.tpl,v
retrieving revision 1.5
diff -u -3 -r1.5 Makefile.tpl
--- Makefile.tpl	29 Sep 2002 15:53:23 -0000	1.5
+++ Makefile.tpl	29 Sep 2002 16:48:26 -0000
@@ -550,11 +550,6 @@
 
 # This is a list of the install targets for all of the modules which are
 # compiled using $(FLAGS_TO_PASS).
-# We put install-opcodes before install-binutils because the installed
-# binutils might be on PATH, and they might need the shared opcodes
-# library.
-# We put install-tcl before install-itcl because itcl wants to run a
-# program on installation which uses the Tcl libraries.
 INSTALL_MODULES = [+ FOR host_modules+][+ IF no_install +][+ ELSE no_install +]\
 	install-[+module+] [+ ENDIF no_install +][+ ENDFOR host_modules +]\
 	$(EXTRA_TARGET_HOST_INSTALL_MODULES)
@@ -1462,6 +1457,16 @@
 install-target: $(INSTALL_TARGET_MODULES)
 install-gdb: install-tcl install-tk install-itcl install-tix install-libgui
 install-sid: install-tcl 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: install-opcodes
+
+# We put install-tcl before install-itcl because itcl wants to run a
+# program on installation which uses the Tcl libraries.
+install-itcl: install-tcl
+
 
 # Dependencies of all-target-foo on configure-target-foo.
 [+ FOR target_modules +]all-target-[+module+]: configure-target-[+module+]


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: top level: make more dependencies explicit
  2002-09-29  9:56 top level: make more dependencies explicit Nathanael Nerode
@ 2002-09-29 10:09 ` Andrew Cagney
  2002-09-29 10:30   ` Nathanael Nerode
  2002-09-30  9:49 ` top level: make more dependencies explicit DJ Delorie
  1 sibling, 1 reply; 11+ messages in thread
From: Andrew Cagney @ 2002-09-29 10:09 UTC (permalink / raw)
  To: Nathanael Nerode; +Cc: binutils, gdb-patches, dj

Nathanael,

FYI, I'm about to revert this change:

2002-09-25  Nathanael Nerode  <neroden@gcc.gnu.org>

         * Makefile.tpl: Make subsituted variables more autoconfy.
         * Makefile.in: Regenerate.
         * configure: Make seds more autoconfy.

It breaks both the GDB and BINUITLS snapshot processes.  Details to 
follow, however, suggest a short pause.

Andrew


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: top level: make more dependencies explicit
  2002-09-29 10:09 ` Andrew Cagney
@ 2002-09-29 10:30   ` Nathanael Nerode
  2002-09-29 10:45     ` Andrew Cagney
  0 siblings, 1 reply; 11+ messages in thread
From: Nathanael Nerode @ 2002-09-29 10:30 UTC (permalink / raw)
  To: Andrew Cagney; +Cc: gdb-patches, binutils, gcc-patches

On Sun, Sep 29, 2002 at 01:09:22PM -0400, Andrew Cagney wrote:
> Nathanael,
> 
> FYI, I'm about to revert this change:
> 
> 2002-09-25  Nathanael Nerode  <neroden@gcc.gnu.org>
> 
>         * Makefile.tpl: Make subsituted variables more autoconfy.
>         * Makefile.in: Regenerate.
>         * configure: Make seds more autoconfy.
> 
> It breaks both the GDB and BINUITLS snapshot processes.  Details to 
> follow, however, suggest a short pause.
Uh... yuck.

Are there some details on the GDB and BINUTILS snapshot processes so that
I can fix *them*?  This change is going to happen eventually, even if
it's reverted for now; the Makefile changes will be necessary for
autoonfiscation.

Wait, let me look at Makefile.in...

Ewwwww.  The taz rules use Makefile.in *as a Makefile*. 
That's the root of the problem, isn't it?  Incidentally, that's
disgusting. :-)  

1. Is there a simple way to stop doing this, by generating a proper
Makefile?

2. If not, how about generating an alternate file 'Makefile.in.for.taz'
(better names solicited) for these rules to use, so that the ordinary
Makefile.in can keep progressing?  Would that do?  I think that's pretty
easy.

--Nathanael


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: top level: make more dependencies explicit
  2002-09-29 10:30   ` Nathanael Nerode
@ 2002-09-29 10:45     ` Andrew Cagney
  2002-09-29 12:51       ` Daniel Jacobowitz
       [not found]       ` <20020929174544.GA30373@doctormoo.dyndns.org>
  0 siblings, 2 replies; 11+ messages in thread
From: Andrew Cagney @ 2002-09-29 10:45 UTC (permalink / raw)
  To: Nathanael Nerode; +Cc: gdb-patches, binutils, gcc-patches

> On Sun, Sep 29, 2002 at 01:09:22PM -0400, Andrew Cagney wrote:
> 
>> Nathanael,
>> 
>> FYI, I'm about to revert this change:
>> 
>> 2002-09-25  Nathanael Nerode  <neroden@gcc.gnu.org>
>> 
>>         * Makefile.tpl: Make subsituted variables more autoconfy.
>>         * Makefile.in: Regenerate.
>>         * configure: Make seds more autoconfy.
>> 
>> It breaks both the GDB and BINUITLS snapshot processes.  Details to 
>> follow, however, suggest a short pause.
> 
> Uh... yuck.
> 
> Are there some details on the GDB and BINUTILS snapshot processes so that
> I can fix *them*?  This change is going to happen eventually, even if
> it's reverted for now; the Makefile changes will be necessary for
> autoonfiscation.
> 
> Wait, let me look at Makefile.in...
> 
> Ewwwww.  The taz rules use Makefile.in *as a Makefile*. 
> That's the root of the problem, isn't it?  Incidentally, that's
> disgusting. :-)  

Well I think ``SHELL = @config_shell@'' is ugly :-)  Why can't the 
configury code edit ``s/^SHELL =.*/SHELL = $.../''.

The mechanism is very old (it pre-dates me as GDB release engineer). 
Changing it is going to involve updates to many things - snapshot 
scripts, release process doco, .... so won't happen overnight.

Andrew


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: top level: make more dependencies explicit
  2002-09-29 10:45     ` Andrew Cagney
@ 2002-09-29 12:51       ` Daniel Jacobowitz
  2002-09-29 12:58         ` H. J. Lu
       [not found]       ` <20020929174544.GA30373@doctormoo.dyndns.org>
  1 sibling, 1 reply; 11+ messages in thread
From: Daniel Jacobowitz @ 2002-09-29 12:51 UTC (permalink / raw)
  To: Andrew Cagney; +Cc: Nathanael Nerode, gdb-patches, binutils, gcc-patches

On Sun, Sep 29, 2002 at 01:45:40PM -0400, Andrew Cagney wrote:
> >On Sun, Sep 29, 2002 at 01:09:22PM -0400, Andrew Cagney wrote:
> >
> >>Nathanael,
> >>
> >>FYI, I'm about to revert this change:
> >>
> >>2002-09-25  Nathanael Nerode  <neroden@gcc.gnu.org>
> >>
> >>        * Makefile.tpl: Make subsituted variables more autoconfy.
> >>        * Makefile.in: Regenerate.
> >>        * configure: Make seds more autoconfy.
> >>
> >>It breaks both the GDB and BINUITLS snapshot processes.  Details to 
> >>follow, however, suggest a short pause.
> >
> >Uh... yuck.
> >
> >Are there some details on the GDB and BINUTILS snapshot processes so that
> >I can fix *them*?  This change is going to happen eventually, even if
> >it's reverted for now; the Makefile changes will be necessary for
> >autoonfiscation.
> >
> >Wait, let me look at Makefile.in...
> >
> >Ewwwww.  The taz rules use Makefile.in *as a Makefile*. 
> >That's the root of the problem, isn't it?  Incidentally, that's
> >disgusting. :-)  
> 
> Well I think ``SHELL = @config_shell@'' is ugly :-)  Why can't the 
> configury code edit ``s/^SHELL =.*/SHELL = $.../''.

Because that's disgusting?  Having something which doesn't look like a
configury-overridden variable be edited in configure is very fragile.

> The mechanism is very old (it pre-dates me as GDB release engineer). 
> Changing it is going to involve updates to many things - snapshot 
> scripts, release process doco, .... so won't happen overnight.

GCC has had a separate script to make releases for years and years. 
It's time GDB and Binutils did the same.

-- 
Daniel Jacobowitz
MontaVista Software                         Debian GNU/Linux Developer


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: top level: make more dependencies explicit
  2002-09-29 12:51       ` Daniel Jacobowitz
@ 2002-09-29 12:58         ` H. J. Lu
  0 siblings, 0 replies; 11+ messages in thread
From: H. J. Lu @ 2002-09-29 12:58 UTC (permalink / raw)
  To: Andrew Cagney, Nathanael Nerode, gdb-patches, binutils, gcc-patches

On Sun, Sep 29, 2002 at 03:51:18PM -0400, Daniel Jacobowitz wrote:
> On Sun, Sep 29, 2002 at 01:45:40PM -0400, Andrew Cagney wrote:
> > >On Sun, Sep 29, 2002 at 01:09:22PM -0400, Andrew Cagney wrote:
> > >
> > >>Nathanael,
> > >>
> > >>FYI, I'm about to revert this change:
> > >>
> > >>2002-09-25  Nathanael Nerode  <neroden@gcc.gnu.org>
> > >>
> > >>        * Makefile.tpl: Make subsituted variables more autoconfy.
> > >>        * Makefile.in: Regenerate.
> > >>        * configure: Make seds more autoconfy.
> > >>
> > >>It breaks both the GDB and BINUITLS snapshot processes.  Details to 
> > >>follow, however, suggest a short pause.
> > >
> > >Uh... yuck.
> > >
> > >Are there some details on the GDB and BINUTILS snapshot processes so that
> > >I can fix *them*?  This change is going to happen eventually, even if
> > >it's reverted for now; the Makefile changes will be necessary for
> > >autoonfiscation.
> > >
> > >Wait, let me look at Makefile.in...
> > >
> > >Ewwwww.  The taz rules use Makefile.in *as a Makefile*. 
> > >That's the root of the problem, isn't it?  Incidentally, that's
> > >disgusting. :-)  
> > 
> > Well I think ``SHELL = @config_shell@'' is ugly :-)  Why can't the 
> > configury code edit ``s/^SHELL =.*/SHELL = $.../''.
> 
> Because that's disgusting?  Having something which doesn't look like a
> configury-overridden variable be edited in configure is very fragile.
> 
> > The mechanism is very old (it pre-dates me as GDB release engineer). 
> > Changing it is going to involve updates to many things - snapshot 
> > scripts, release process doco, .... so won't happen overnight.
> 
> GCC has had a separate script to make releases for years and years. 
> It's time GDB and Binutils did the same.

FWIW, I like the current GDB release scheme a lot. It is very useful in
my envrionment.


H.J.


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Top level: Separate src release scripts from Makefile
       [not found]             ` <3D9764F8.7000100@redhat.com>
@ 2002-09-29 14:50               ` Nathanael Nerode
  2002-09-29 15:13                 ` DJ Delorie
  2002-09-30 11:47                 ` Alexandre Oliva
  0 siblings, 2 replies; 11+ messages in thread
From: Nathanael Nerode @ 2002-09-29 14:50 UTC (permalink / raw)
  To: Andrew Cagney; +Cc: dj, binutils, gdb-patches, gcc-patches

[-- Attachment #1: Type: text/plain, Size: 1710 bytes --]

Corresponding to Andrew's wise suggestion, I simply separated the release
script material into a separate file, which can be dealt with
independently of the Makefile.  The new file is "src-release", and it's
just a Makefile, so as to demand minimal code change.  The only changes
are replacement of '-f Makefile.in' with '-f src-release'.  I would have
put it in a subdirectory, but that would have demanded more substantial
changes.

With this change my other changes no longer break anything and can be
reinstated.

On Sun, Sep 29, 2002 at 04:39:20PM -0400, Andrew Cagney wrote:
> ``Looks like'' isn't sufficient :-)  The commands:
> 	gmake -f Makefile.in gdb+dejagnu.tar
'make -f src-release gdb+dejagnu.tar' works.

> 	gmake -f Makefile.in insight+dejagnu.tar
> and some equivalent for binutils, need to work (I'm not sure what 
> BINUTILS uses, ask DanielJ).

I'm currently testing 'make -f src-release gas.tar.bz2'.

I assume the rest work, since there's no real code change, and the others
are all along the same lines.

'src-release' doesn't need to be in the gcc tree.

The admin scripts to make gdb, bintuils, newlib, etc. snapshots need to
be changed to use 'src-release' rather than 'Makefile.in' -- but I don't
know where those scripts are.

The documentation for snapshots and releases needs to be changed
correspondingly, but again I don't know where it is.

If this patch is approved, I won't put it in until I've found all these
points and arranged to deal with them.

Further comments welcomed.

2002-09-29  Nathanael Nerode  <neroden@gcc.gnu.org>

	* src-release: New file, split from Makefile.tpl.
	* Makefile.tpl: Remove parts now in src-release.
	* Makefile.in: Regenerate.

--Nathanael


[-- Attachment #2: src-release --]
[-- Type: text/plain, Size: 12259 bytes --]

#   Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
#   1999, 2000, 2001, 2002 Free Software Foundation
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
# 
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
# 
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#

# This Makefile contains release scripts for gdb, binutils, and other
# packages which live in src.  It used to be part of the top level Makefile,
# but that turned out to be very messy and hard to maintain.

# This stuff really ought to be cleaned up and turned into something other
# than a Makefile.  As it is it's heavily recursive.

# This is the name of this script (!).  Needed due to horrible recursion.
SELF = src-release

SHELL = /bin/sh

# pwd command to use.  Allow user to override default by setting PWDCMD in
# the environment to account for automounters.  The make variable must not
# be called PWDCMD, otherwise the value set here is passed to make
# subprocesses and overrides the setting from the user's environment.
PWD = $${PWDCMD-pwd}

#
# Support for building net releases

# Files in devo used in any net release.
# ChangeLog omitted because it may refer to files which are not in this
# distribution (perhaps it would be better to include it anyway).
DEVO_SUPPORT= README Makefile.in configure configure.in \
	config.guess config.if config.sub config move-if-change \
	mpw-README mpw-build.in mpw-config.in mpw-configure mpw-install \
	COPYING COPYING.LIB install-sh config-ml.in symlink-tree \
	mkinstalldirs ltconfig ltmain.sh missing ylwrap \
	libtool.m4 gettext.m4 ltcf-c.sh ltcf-cxx.sh ltcf-gcj.sh

# Files in devo/etc used in any net release.
# ChangeLog omitted because it may refer to files which are not in this
# distribution (perhaps it would be better to include it anyway).
ETC_SUPPORT= Makefile.in configure configure.in standards.texi \
	make-stds.texi standards.info* configure.texi configure.info* \
	configbuild.* configdev.*


# When you use `make setup-dirs' or `make taz' you should always redefine
# this macro.
SUPPORT_FILES = list-of-support-files-for-tool-in-question

# NOTE: No double quotes in the below.  It is used within shell script
# as VER="$(VER)"
VER = `	if grep 'AM_INIT_AUTOMAKE.*BFD_VERSION' $(TOOL)/configure.in >/dev/null 2>&1; then \
	  sed < bfd/configure.in -n 's/AM_INIT_AUTOMAKE[^,]*, *\([^)]*\))/\1/p'; \
	elif grep AM_INIT_AUTOMAKE $(TOOL)/configure.in >/dev/null 2>&1; then \
	  sed < $(TOOL)/configure.in -n 's/AM_INIT_AUTOMAKE[^,]*, *\([^)]*\))/\1/p'; \
	elif test -f $(TOOL)/version.in; then \
	  head -1 $(TOOL)/version.in; \
	elif grep VERSION $(TOOL)/Makefile.in > /dev/null 2>&1; then \
	  sed < $(TOOL)/Makefile.in -n 's/^VERSION *= *//p'; \
	else \
	  echo VERSION; \
	fi`
PACKAGE = $(TOOL)

.PHONY: taz
taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex
	$(MAKE) -f $(SELF) do-proto-toplev \
		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
		MD5PROG="$(MD5PROG)" \
		SUPPORT_FILES="$(SUPPORT_FILES)"
	$(MAKE) -f $(SELF) do-md5sum \
		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
		MD5PROG="$(MD5PROG)" \
		SUPPORT_FILES="$(SUPPORT_FILES)"
	$(MAKE) -f $(SELF) do-tar \
		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
		MD5PROG="$(MD5PROG)" \
		SUPPORT_FILES="$(SUPPORT_FILES)"
	$(MAKE) -f $(SELF) do-bz2 \
		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
		MD5PROG="$(MD5PROG)" \
		SUPPORT_FILES="$(SUPPORT_FILES)"

.PHONY: gdb-tar
gdb-tar: $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex
	$(MAKE) -f $(SELF) do-proto-toplev \
		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
		MD5PROG="$(MD5PROG)" \
		SUPPORT_FILES="$(SUPPORT_FILES)"
	$(MAKE) -f $(SELF) do-md5sum \
		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
		MD5PROG="$(MD5PROG)" \
		SUPPORT_FILES="$(SUPPORT_FILES)"
	$(MAKE) -f $(SELF) do-djunpack \
		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
		MD5PROG="$(MD5PROG)" \
		SUPPORT_FILES="$(SUPPORT_FILES)"
	$(MAKE) -f $(SELF) do-tar \
		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
		MD5PROG="$(MD5PROG)" \
		SUPPORT_FILES="$(SUPPORT_FILES)"

.PHONY: gdb-taz
gdb-taz: gdb-tar $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex
	$(MAKE) -f $(SELF) gdb-tar \
		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
		MD5PROG="$(MD5PROG)" \
		SUPPORT_FILES="$(SUPPORT_FILES)"
	$(MAKE) -f $(SELF) do-bz2 \
		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
		MD5PROG="$(MD5PROG)" \
		SUPPORT_FILES="$(SUPPORT_FILES)"

.PHONY: do-proto-toplev
do-proto-toplev: $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex
	echo "==> Making $(PACKAGE)-$(VER)/"
	# Take out texinfo from a few places.
	sed -e '/^all\.normal: /s/\all-texinfo //' \
	    -e '/^	install-texinfo /d' \
	<Makefile.in >tmp
	mv -f tmp Makefile.in
	#
	./configure sun4
	[ -z "$(CONFIGURE_TARGET_MODULES)" ] \
	  || $(MAKE) $(CONFIGURE_TARGET_MODULES) \
	    ALL_GCC="" ALL_GCC_C="" ALL_GCC_CXX="" \
	    CC_FOR_TARGET="$(CC)" CXX_FOR_TARGET="$(CXX)"
	# Make links, and run "make diststuff" or "make info" when needed.
	rm -rf proto-toplev ; mkdir proto-toplev
	set -e ; dirs="$(TOOL) $(DEVO_SUPPORT) $(SUPPORT_FILES)" ; \
	for d in $$dirs ; do \
	  if [ -d $$d ]; then \
	    if [ ! -f $$d/Makefile ] ; then true ; \
	    elif grep '^diststuff:' $$d/Makefile >/dev/null ; then \
		(cd $$d ; $(MAKE) diststuff ) || exit 1 ; \
	    elif grep '^info:' $$d/Makefile >/dev/null ; then \
	        (cd $$d ; $(MAKE) info ) || exit 1 ; \
	    fi ; \
	    if [ -d $$d/proto-$$d.dir ]; then \
	      ln -s ../$$d/proto-$$d.dir proto-toplev/$$d ; \
	    else \
	      ln -s ../$$d proto-toplev/$$d ; \
	    fi ; \
	  else ln -s ../$$d proto-toplev/$$d ; fi ; \
	done
	cd etc && $(MAKE) info
	$(MAKE) distclean
	#
	mkdir proto-toplev/etc
	(cd proto-toplev/etc; \
	 for i in $(ETC_SUPPORT); do \
		ln -s ../../etc/$$i . ; \
	 done)
	#
	# Take out texinfo from configurable dirs
	rm proto-toplev/configure.in
	sed -e '/^host_tools=/s/texinfo //' \
	    <configure.in >proto-toplev/configure.in
	#
	mkdir proto-toplev/texinfo
	ln -s ../../texinfo/texinfo.tex		proto-toplev/texinfo/
	if test -r texinfo/util/tex3patch ; then \
	  mkdir proto-toplev/texinfo/util && \
	  ln -s ../../../texinfo/util/tex3patch	proto-toplev/texinfo/util ; \
	else true; fi
	chmod -R og=u . || chmod og=u `find . -print`
	#
	# Create .gmo files from .po files.
	for f in `find . -name '*.po' -type f -print`; do \
	     msgfmt -o `echo $$f | sed -e 's/\.po$$/.gmo/'` $$f ; \
	done
	#
	-rm -f $(PACKAGE)-$(VER)
	ln -s proto-toplev $(PACKAGE)-$(VER)

.PHONY: do-tar
do-tar:
	echo "==> Making $(PACKAGE)-$(VER).tar"
	-rm -f $(PACKAGE)-$(VER).tar
	find $(PACKAGE)-$(VER) -follow -name CVS -prune -o -type f -print \
		| tar cTfh - $(PACKAGE)-$(VER).tar

.PHONY: do-bz2
do-bz2:
	echo "==> Bzipping $(PACKAGE)-$(VER).tar.bz2"
	-rm -f $(PACKAGE)-$(VER).tar.bz2
	$(BZIPPROG) -v -9 $(PACKAGE)-$(VER).tar

.PHONY: do-md5sum
do-md5sum:
	echo "==> Adding md5 checksum to top-level directory"
	cd proto-toplev && find * -follow -name CVS -prune -o -type f -print \
		| xargs $(MD5PROG) > ../md5.sum
	mv md5.sum proto-toplev

.PHONY: do-djunpack
do-djunpack:
	echo "==> Adding updated djunpack.bat to top-level directory"
	echo - 's /gdb-[0-9\.]*/gdb-'"$(VER)"'/'
	sed < djunpack.bat > djunpack.new \
		-e 's/gdb-[0-9][0-9\.]*/gdb-'"$(VER)"'/'
	mv djunpack.new djunpack.bat
	-rm -f proto-toplev/djunpack.bat
	ln -s ../djunpack.bat proto-toplev/djunpack.bat

TEXINFO_SUPPORT= texinfo/texinfo.tex
DIST_SUPPORT= $(DEVO_SUPPORT) $(TEXINFO_SUPPORT)

.PHONY: gas.tar.bz2
GAS_SUPPORT_DIRS= bfd include libiberty opcodes intl setup.com makefile.vms mkdep
gas.tar.bz2: $(DIST_SUPPORT) $(GAS_SUPPORT_DIRS) gas
	$(MAKE) -f $(SELF) taz TOOL=gas \
		MD5PROG="$(MD5PROG)" \
		SUPPORT_FILES="$(GAS_SUPPORT_DIRS)"

# The FSF "binutils" release includes gprof and ld.
.PHONY: binutils.tar.bz2
BINUTILS_SUPPORT_DIRS= bfd gas include libiberty opcodes ld gprof intl setup.com makefile.vms mkdep
binutils.tar.bz2: $(DIST_SUPPORT) $(BINUTILS_SUPPORT_DIRS) binutils
	$(MAKE) -f $(SELF) taz TOOL=binutils \
		MD5PROG="$(MD5PROG)" \
		SUPPORT_FILES="$(BINUTILS_SUPPORT_DIRS)"

.PHONY: gas+binutils.tar.bz2
GASB_SUPPORT_DIRS= $(GAS_SUPPORT_DIRS) binutils ld gprof
gas+binutils.tar.bz2: $(DIST_SUPPORT) $(GASB_SUPPORT_DIRS) gas
	$(MAKE) -f $(SELF) taz TOOL=gas \
		MD5PROG="$(MD5PROG)" \
		SUPPORT_FILES="$(GASB_SUPPORT_DIRS)"

GNATS_SUPPORT_DIRS=include libiberty send-pr
gnats.tar.bz2: $(DIST_SUPPORT) $(GNATS_SUPPORT_DIRS) gnats
	$(MAKE) -f  $(SELF) taz TOOL=gnats \
		MD5PROG="$(MD5PROG)" \
		SUPPORT_FILES="$(GNATS_SUPPORT_DIRS)"

.PHONY: gdb.tar.bz2
GDB_SUPPORT_DIRS= bfd include libiberty mmalloc opcodes readline sim utils intl
gdb.tar.bz2: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb
	$(MAKE) -f $(SELF) gdb-taz TOOL=gdb \
		MD5PROG="$(MD5PROG)" \
		SUPPORT_FILES="$(GDB_SUPPORT_DIRS)"
.PHONY: gdb.tar
gdb.tar: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb
	$(MAKE) -f $(SELF) gdb-tar TOOL=gdb \
		MD5PROG="$(MD5PROG)" \
		SUPPORT_FILES="$(GDB_SUPPORT_DIRS)"

DEJAGNU_SUPPORT_DIRS=  tcl expect libiberty
.PHONY: dejagnu.tar.bz2
dejagnu.tar.bz2: $(DIST_SUPPORT) $(DEJAGNU_SUPPORT_DIRS) dejagnu
	$(MAKE) -f $(SELF) taz TOOL=dejagnu \
		MD5PROG="$(MD5PROG)" \
		SUPPORT_FILES="$(DEJAGNU_SUPPORT_DIRS)"

.PHONY: gdb+dejagnu.tar.bz2
GDBD_SUPPORT_DIRS= $(GDB_SUPPORT_DIRS) tcl expect dejagnu
gdb+dejagnu.tar.bz2: $(DIST_SUPPORT) $(GDBD_SUPPORT_DIRS) gdb
	$(MAKE) -f $(SELF) gdb-taz TOOL=gdb PACKAGE=gdb+dejagnu \
		MD5PROG="$(MD5PROG)" \
		SUPPORT_FILES="$(GDBD_SUPPORT_DIRS)"
.PHONY: gdb+dejagnu.tar
gdb+dejagnu.tar: $(DIST_SUPPORT) $(GDBD_SUPPORT_DIRS) gdb
	$(MAKE) -f $(SELF) gdb-tar TOOL=gdb PACKAGE=gdb+dejagnu \
		MD5PROG="$(MD5PROG)" \
		SUPPORT_FILES="$(GDBD_SUPPORT_DIRS)"

.PHONY: insight.tar.bz2
INSIGHT_SUPPORT_DIRS= $(GDB_SUPPORT_DIRS) tcl tk itcl tix libgui
insight.tar.bz2: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb
	$(MAKE) -f $(SELF) gdb-taz TOOL=gdb PACKAGE=insight \
		MD5PROG="$(MD5PROG)" \
		SUPPORT_FILES="$(INSIGHT_SUPPORT_DIRS)"
.PHONY: insight.tar
insight.tar: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb
	$(MAKE) -f $(SELF) gdb-tar TOOL=gdb PACKAGE=insight \
		MD5PROG="$(MD5PROG)" \
		SUPPORT_FILES="$(INSIGHT_SUPPORT_DIRS)"

.PHONY: insight+dejagnu.tar.bz2
INSIGHTD_SUPPORT_DIRS= $(INSIGHT_SUPPORT_DIRS) expect dejagnu
insight+dejagnu.tar.bz2: $(DIST_SUPPORT) $(INSIGHTD_SUPPORT_DIRS) gdb
	$(MAKE) -f $(SELF) gdb-taz TOOL=gdb PACKAGE="insight+dejagnu" \
		MD5PROG="$(MD5PROG)" \
		SUPPORT_FILES="$(INSIGHTD_SUPPORT_DIRS)"
.PHONY: insight+dejagnu.tar
insight+dejagnu.tar: $(DIST_SUPPORT) $(INSIGHTD_SUPPORT_DIRS) gdb
	$(MAKE) -f $(SELF) gdb-tar TOOL=gdb PACKAGE="insight+dejagnu" \
		MD5PROG="$(MD5PROG)" \
		SUPPORT_FILES="$(INSIGHTD_SUPPORT_DIRS)"

.PHONY: newlib.tar.bz2
NEWLIB_SUPPORT_DIRS=libgloss
# taz configures for the sun4 target which won't configure newlib.
# We need newlib configured so that the .info files are made.
# Unfortunately, it is not enough to just configure newlib separately:
# taz will build the .info files but since SUBDIRS won't contain newlib,
# distclean won't be run (leaving Makefile, config.status, and the tmp files
# used in building the .info files, eg: *.def, *.ref).
# The problem isn't solvable however without a lot of extra work because
# target libraries are built in subdir $(target_alias) which gets nuked during
# the make distclean.  For now punt on the issue of shipping newlib info files
# with newlib net releases and wait for a day when some native target (sun4?)
# supports newlib (if only minimally).
newlib.tar.bz2: $(DIST_SUPPORT) $(NEWLIB_SUPPORT_DIRS) newlib
	$(MAKE) -f $(SELF) taz TOOL=newlib \
		MD5PROG="$(MD5PROG)" \
		SUPPORT_FILES="$(NEWLIB_SUPPORT_DIRS)" \
		DEVO_SUPPORT="$(DEVO_SUPPORT) COPYING.NEWLIB" newlib

.NOEXPORT:
MAKEOVERRIDES=

[-- Attachment #3: Makefile.tpl.diff --]
[-- Type: text/plain, Size: 11381 bytes --]

Index: Makefile.tpl
===================================================================
RCS file: /cvs/src/src/Makefile.tpl,v
retrieving revision 1.5
diff -u -3 -r1.5 Makefile.tpl
--- Makefile.tpl	29 Sep 2002 15:59:34 -0000	1.5
+++ Makefile.tpl	29 Sep 2002 21:02:38 -0000
@@ -1507,290 +1507,6 @@
 	$(SHELL) ./config.status
 
 #
-# Support for building net releases
-
-# Files in devo used in any net release.
-# ChangeLog omitted because it may refer to files which are not in this
-# distribution (perhaps it would be better to include it anyway).
-DEVO_SUPPORT= README Makefile.in configure configure.in \
-	config.guess config.if config.sub config move-if-change \
-	mpw-README mpw-build.in mpw-config.in mpw-configure mpw-install \
-	COPYING COPYING.LIB install-sh config-ml.in symlink-tree \
-	mkinstalldirs ltconfig ltmain.sh missing ylwrap \
-	libtool.m4 gettext.m4 ltcf-c.sh ltcf-cxx.sh ltcf-gcj.sh
-
-# Files in devo/etc used in any net release.
-# ChangeLog omitted because it may refer to files which are not in this
-# distribution (perhaps it would be better to include it anyway).
-ETC_SUPPORT= Makefile.in configure configure.in standards.texi \
-	make-stds.texi standards.info* configure.texi configure.info* \
-	configbuild.* configdev.*
-
-
-# When you use `make setup-dirs' or `make taz' you should always redefine
-# this macro.
-SUPPORT_FILES = list-of-support-files-for-tool-in-question
-
-# NOTE: No double quotes in the below.  It is used within shell script
-# as VER="$(VER)"
-VER = `	if grep 'AM_INIT_AUTOMAKE.*BFD_VERSION' $(TOOL)/configure.in >/dev/null 2>&1; then \
-	  sed < bfd/configure.in -n 's/AM_INIT_AUTOMAKE[^,]*, *\([^)]*\))/\1/p'; \
-	elif grep AM_INIT_AUTOMAKE $(TOOL)/configure.in >/dev/null 2>&1; then \
-	  sed < $(TOOL)/configure.in -n 's/AM_INIT_AUTOMAKE[^,]*, *\([^)]*\))/\1/p'; \
-	elif test -f $(TOOL)/version.in; then \
-	  head -1 $(TOOL)/version.in; \
-	elif grep VERSION $(TOOL)/Makefile.in > /dev/null 2>&1; then \
-	  sed < $(TOOL)/Makefile.in -n 's/^VERSION *= *//p'; \
-	else \
-	  echo VERSION; \
-	fi`
-PACKAGE = $(TOOL)
-
-.PHONY: taz
-taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex
-	$(MAKE) -f Makefile.in do-proto-toplev \
-		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(SUPPORT_FILES)"
-	$(MAKE) -f Makefile.in do-md5sum \
-		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(SUPPORT_FILES)"
-	$(MAKE) -f Makefile.in do-tar \
-		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(SUPPORT_FILES)"
-	$(MAKE) -f Makefile.in do-bz2 \
-		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(SUPPORT_FILES)"
-
-.PHONY: gdb-tar
-gdb-tar: $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex
-	$(MAKE) -f Makefile.in do-proto-toplev \
-		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(SUPPORT_FILES)"
-	$(MAKE) -f Makefile.in do-md5sum \
-		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(SUPPORT_FILES)"
-	$(MAKE) -f Makefile.in do-djunpack \
-		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(SUPPORT_FILES)"
-	$(MAKE) -f Makefile.in do-tar \
-		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(SUPPORT_FILES)"
-
-.PHONY: gdb-taz
-gdb-taz: gdb-tar $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex
-	$(MAKE) -f Makefile.in gdb-tar \
-		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(SUPPORT_FILES)"
-	$(MAKE) -f Makefile.in do-bz2 \
-		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(SUPPORT_FILES)"
-
-.PHONY: do-proto-toplev
-do-proto-toplev: $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex
-	echo "==> Making $(PACKAGE)-$(VER)/"
-	# Take out texinfo from a few places.
-	sed -e '/^all\.normal: /s/\all-texinfo //' \
-	    -e '/^	install-texinfo /d' \
-	<Makefile.in >tmp
-	mv -f tmp Makefile.in
-	#
-	./configure sun4
-	[ -z "$(CONFIGURE_TARGET_MODULES)" ] \
-	  || $(MAKE) $(CONFIGURE_TARGET_MODULES) \
-	    ALL_GCC="" ALL_GCC_C="" ALL_GCC_CXX="" \
-	    CC_FOR_TARGET="$(CC)" CXX_FOR_TARGET="$(CXX)"
-	# Make links, and run "make diststuff" or "make info" when needed.
-	rm -rf proto-toplev ; mkdir proto-toplev
-	set -e ; dirs="$(TOOL) $(DEVO_SUPPORT) $(SUPPORT_FILES)" ; \
-	for d in $$dirs ; do \
-	  if [ -d $$d ]; then \
-	    if [ ! -f $$d/Makefile ] ; then true ; \
-	    elif grep '^diststuff:' $$d/Makefile >/dev/null ; then \
-		(cd $$d ; $(MAKE) diststuff ) || exit 1 ; \
-	    elif grep '^info:' $$d/Makefile >/dev/null ; then \
-	        (cd $$d ; $(MAKE) info ) || exit 1 ; \
-	    fi ; \
-	    if [ -d $$d/proto-$$d.dir ]; then \
-	      ln -s ../$$d/proto-$$d.dir proto-toplev/$$d ; \
-	    else \
-	      ln -s ../$$d proto-toplev/$$d ; \
-	    fi ; \
-	  else ln -s ../$$d proto-toplev/$$d ; fi ; \
-	done
-	cd etc && $(MAKE) info
-	$(MAKE) distclean
-	#
-	mkdir proto-toplev/etc
-	(cd proto-toplev/etc; \
-	 for i in $(ETC_SUPPORT); do \
-		ln -s ../../etc/$$i . ; \
-	 done)
-	#
-	# Take out texinfo from configurable dirs
-	rm proto-toplev/configure.in
-	sed -e '/^host_tools=/s/texinfo //' \
-	    <configure.in >proto-toplev/configure.in
-	#
-	mkdir proto-toplev/texinfo
-	ln -s ../../texinfo/texinfo.tex		proto-toplev/texinfo/
-	if test -r texinfo/util/tex3patch ; then \
-	  mkdir proto-toplev/texinfo/util && \
-	  ln -s ../../../texinfo/util/tex3patch	proto-toplev/texinfo/util ; \
-	else true; fi
-	chmod -R og=u . || chmod og=u `find . -print`
-	#
-	# Create .gmo files from .po files.
-	for f in `find . -name '*.po' -type f -print`; do \
-	     msgfmt -o `echo $$f | sed -e 's/\.po$$/.gmo/'` $$f ; \
-	done
-	#
-	-rm -f $(PACKAGE)-$(VER)
-	ln -s proto-toplev $(PACKAGE)-$(VER)
-
-.PHONY: do-tar
-do-tar:
-	echo "==> Making $(PACKAGE)-$(VER).tar"
-	-rm -f $(PACKAGE)-$(VER).tar
-	find $(PACKAGE)-$(VER) -follow -name CVS -prune -o -type f -print \
-		| tar cTfh - $(PACKAGE)-$(VER).tar
-
-.PHONY: do-bz2
-do-bz2:
-	echo "==> Bzipping $(PACKAGE)-$(VER).tar.bz2"
-	-rm -f $(PACKAGE)-$(VER).tar.bz2
-	$(BZIPPROG) -v -9 $(PACKAGE)-$(VER).tar
-
-.PHONY: do-md5sum
-do-md5sum:
-	echo "==> Adding md5 checksum to top-level directory"
-	cd proto-toplev && find * -follow -name CVS -prune -o -type f -print \
-		| xargs $(MD5PROG) > ../md5.sum
-	mv md5.sum proto-toplev
-
-.PHONY: do-djunpack
-do-djunpack:
-	echo "==> Adding updated djunpack.bat to top-level directory"
-	echo - 's /gdb-[0-9\.]*/gdb-'"$(VER)"'/'
-	sed < djunpack.bat > djunpack.new \
-		-e 's/gdb-[0-9][0-9\.]*/gdb-'"$(VER)"'/'
-	mv djunpack.new djunpack.bat
-	-rm -f proto-toplev/djunpack.bat
-	ln -s ../djunpack.bat proto-toplev/djunpack.bat
-
-TEXINFO_SUPPORT= texinfo/texinfo.tex
-DIST_SUPPORT= $(DEVO_SUPPORT) $(TEXINFO_SUPPORT)
-
-.PHONY: gas.tar.bz2
-GAS_SUPPORT_DIRS= bfd include libiberty opcodes intl setup.com makefile.vms mkdep
-gas.tar.bz2: $(DIST_SUPPORT) $(GAS_SUPPORT_DIRS) gas
-	$(MAKE) -f Makefile.in taz TOOL=gas \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(GAS_SUPPORT_DIRS)"
-
-# The FSF "binutils" release includes gprof and ld.
-.PHONY: binutils.tar.bz2
-BINUTILS_SUPPORT_DIRS= bfd gas include libiberty opcodes ld gprof intl setup.com makefile.vms mkdep
-binutils.tar.bz2: $(DIST_SUPPORT) $(BINUTILS_SUPPORT_DIRS) binutils
-	$(MAKE) -f Makefile.in taz TOOL=binutils \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(BINUTILS_SUPPORT_DIRS)"
-
-.PHONY: gas+binutils.tar.bz2
-GASB_SUPPORT_DIRS= $(GAS_SUPPORT_DIRS) binutils ld gprof
-gas+binutils.tar.bz2: $(DIST_SUPPORT) $(GASB_SUPPORT_DIRS) gas
-	$(MAKE) -f Makefile.in taz TOOL=gas \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(GASB_SUPPORT_DIRS)"
-
-GNATS_SUPPORT_DIRS=include libiberty send-pr
-gnats.tar.bz2: $(DIST_SUPPORT) $(GNATS_SUPPORT_DIRS) gnats
-	$(MAKE) -f  Makefile.in taz TOOL=gnats \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(GNATS_SUPPORT_DIRS)"
-
-.PHONY: gdb.tar.bz2
-GDB_SUPPORT_DIRS= bfd include libiberty mmalloc opcodes readline sim utils intl
-gdb.tar.bz2: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb
-	$(MAKE) -f Makefile.in gdb-taz TOOL=gdb \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(GDB_SUPPORT_DIRS)"
-.PHONY: gdb.tar
-gdb.tar: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb
-	$(MAKE) -f Makefile.in gdb-tar TOOL=gdb \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(GDB_SUPPORT_DIRS)"
-
-DEJAGNU_SUPPORT_DIRS=  tcl expect libiberty
-.PHONY: dejagnu.tar.bz2
-dejagnu.tar.bz2: $(DIST_SUPPORT) $(DEJAGNU_SUPPORT_DIRS) dejagnu
-	$(MAKE) -f Makefile.in taz TOOL=dejagnu \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(DEJAGNU_SUPPORT_DIRS)"
-
-.PHONY: gdb+dejagnu.tar.bz2
-GDBD_SUPPORT_DIRS= $(GDB_SUPPORT_DIRS) tcl expect dejagnu
-gdb+dejagnu.tar.bz2: $(DIST_SUPPORT) $(GDBD_SUPPORT_DIRS) gdb
-	$(MAKE) -f Makefile.in gdb-taz TOOL=gdb PACKAGE=gdb+dejagnu \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(GDBD_SUPPORT_DIRS)"
-.PHONY: gdb+dejagnu.tar
-gdb+dejagnu.tar: $(DIST_SUPPORT) $(GDBD_SUPPORT_DIRS) gdb
-	$(MAKE) -f Makefile.in gdb-tar TOOL=gdb PACKAGE=gdb+dejagnu \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(GDBD_SUPPORT_DIRS)"
-
-.PHONY: insight.tar.bz2
-INSIGHT_SUPPORT_DIRS= $(GDB_SUPPORT_DIRS) tcl tk itcl tix libgui
-insight.tar.bz2: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb
-	$(MAKE) -f Makefile.in gdb-taz TOOL=gdb PACKAGE=insight \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(INSIGHT_SUPPORT_DIRS)"
-.PHONY: insight.tar
-insight.tar: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb
-	$(MAKE) -f Makefile.in gdb-tar TOOL=gdb PACKAGE=insight \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(INSIGHT_SUPPORT_DIRS)"
-
-.PHONY: insight+dejagnu.tar.bz2
-INSIGHTD_SUPPORT_DIRS= $(INSIGHT_SUPPORT_DIRS) expect dejagnu
-insight+dejagnu.tar.bz2: $(DIST_SUPPORT) $(INSIGHTD_SUPPORT_DIRS) gdb
-	$(MAKE) -f Makefile.in gdb-taz TOOL=gdb PACKAGE="insight+dejagnu" \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(INSIGHTD_SUPPORT_DIRS)"
-.PHONY: insight+dejagnu.tar
-insight+dejagnu.tar: $(DIST_SUPPORT) $(INSIGHTD_SUPPORT_DIRS) gdb
-	$(MAKE) -f Makefile.in gdb-tar TOOL=gdb PACKAGE="insight+dejagnu" \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(INSIGHTD_SUPPORT_DIRS)"
-
-.PHONY: newlib.tar.bz2
-NEWLIB_SUPPORT_DIRS=libgloss
-# taz configures for the sun4 target which won't configure newlib.
-# We need newlib configured so that the .info files are made.
-# Unfortunately, it is not enough to just configure newlib separately:
-# taz will build the .info files but since SUBDIRS won't contain newlib,
-# distclean won't be run (leaving Makefile, config.status, and the tmp files
-# used in building the .info files, eg: *.def, *.ref).
-# The problem isn't solvable however without a lot of extra work because
-# target libraries are built in subdir $(target_alias) which gets nuked during
-# the make distclean.  For now punt on the issue of shipping newlib info files
-# with newlib net releases and wait for a day when some native target (sun4?)
-# supports newlib (if only minimally).
-newlib.tar.bz2: $(DIST_SUPPORT) $(NEWLIB_SUPPORT_DIRS) newlib
-	$(MAKE) -f Makefile.in taz TOOL=newlib \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(NEWLIB_SUPPORT_DIRS)" \
-		DEVO_SUPPORT="$(DEVO_SUPPORT) COPYING.NEWLIB" newlib
 
 .NOEXPORT:
 MAKEOVERRIDES=

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: Top level: Separate src release scripts from Makefile
  2002-09-29 14:50               ` Top level: Separate src release scripts from Makefile Nathanael Nerode
@ 2002-09-29 15:13                 ` DJ Delorie
  2002-09-29 15:23                   ` Nathanael Nerode
  2002-09-30 11:47                 ` Alexandre Oliva
  1 sibling, 1 reply; 11+ messages in thread
From: DJ Delorie @ 2002-09-29 15:13 UTC (permalink / raw)
  To: neroden; +Cc: ac131313, binutils, gdb-patches, gcc-patches


I'm thinking perhaps the release stuff should be in a package-specific
subdirectory?  Like the binutils release script should be in
src/binutils, and the gdb release script in src/gdb ?

And I also agree that src/Makefile.in should not itself be used to do
releases.  That's just icky.


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: Top level: Separate src release scripts from Makefile
  2002-09-29 15:13                 ` DJ Delorie
@ 2002-09-29 15:23                   ` Nathanael Nerode
  0 siblings, 0 replies; 11+ messages in thread
From: Nathanael Nerode @ 2002-09-29 15:23 UTC (permalink / raw)
  To: DJ Delorie; +Cc: gcc-patches, gdb-patches, binutils

On Sun, Sep 29, 2002 at 06:12:57PM -0400, DJ Delorie wrote:
> 
> I'm thinking perhaps the release stuff should be in a package-specific
> subdirectory?  Like the binutils release script should be in
> src/binutils, and the gdb release script in src/gdb ?

Good idea, but it requires an order of magnitude more work to get right;
I'd much rather do it after I manage to get it disentangled from
Makefile.in.  

Also, there's an awful lot of shared code at the moment and it might be
desirable to keep it shared.  (Although I can actually think of two
rather elegant solutions using autogen...)

> And I also agree that src/Makefile.in should not itself be used to do
> releases.  That's just icky.


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: top level: make more dependencies explicit
  2002-09-29  9:56 top level: make more dependencies explicit Nathanael Nerode
  2002-09-29 10:09 ` Andrew Cagney
@ 2002-09-30  9:49 ` DJ Delorie
  1 sibling, 0 replies; 11+ messages in thread
From: DJ Delorie @ 2002-09-30  9:49 UTC (permalink / raw)
  To: neroden; +Cc: gcc-patches, binutils, gdb-patches


> 2002-09-29  Nathanael Nerode  <neroden@gcc.gnu.org>
> 
> 	* Makefile.def: Remove order dependency comments.
> 	* Makefile.tpl: Add explicit install-install dependencies.
> 	* Makefile.in: Regenerate.

Ok.


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: Top level: Separate src release scripts from Makefile
  2002-09-29 14:50               ` Top level: Separate src release scripts from Makefile Nathanael Nerode
  2002-09-29 15:13                 ` DJ Delorie
@ 2002-09-30 11:47                 ` Alexandre Oliva
  1 sibling, 0 replies; 11+ messages in thread
From: Alexandre Oliva @ 2002-09-30 11:47 UTC (permalink / raw)
  To: Nathanael Nerode; +Cc: Andrew Cagney, dj, binutils, gdb-patches, gcc-patches

On Sep 29, 2002, Nathanael Nerode <neroden@doctormoo.dyndns.org> wrote:

> If this patch is approved, I won't put it in until I've found all these
> points and arranged to deal with them.

> 2002-09-29  Nathanael Nerode  <neroden@gcc.gnu.org>

> 	* src-release: New file, split from Makefile.tpl.
> 	* Makefile.tpl: Remove parts now in src-release.
> 	* Makefile.in: Regenerate.

Ok with me.  Personally, I've always found the use of Makefile.in as
if it were a real Makefile a fragile and disgusting hack.

-- 
Alexandre Oliva   Enjoy Guarana', see http://www.ic.unicamp.br/~oliva/
Red Hat GCC Developer                 aoliva@{redhat.com, gcc.gnu.org}
CS PhD student at IC-Unicamp        oliva@{lsd.ic.unicamp.br, gnu.org}
Free Software Evangelist                Professional serial bug killer


^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2002-09-30 18:47 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2002-09-29  9:56 top level: make more dependencies explicit Nathanael Nerode
2002-09-29 10:09 ` Andrew Cagney
2002-09-29 10:30   ` Nathanael Nerode
2002-09-29 10:45     ` Andrew Cagney
2002-09-29 12:51       ` Daniel Jacobowitz
2002-09-29 12:58         ` H. J. Lu
     [not found]       ` <20020929174544.GA30373@doctormoo.dyndns.org>
     [not found]         ` <3D974828.4050009@redhat.com>
     [not found]           ` <20020929190100.GA31652@doctormoo.dyndns.org>
     [not found]             ` <3D9764F8.7000100@redhat.com>
2002-09-29 14:50               ` Top level: Separate src release scripts from Makefile Nathanael Nerode
2002-09-29 15:13                 ` DJ Delorie
2002-09-29 15:23                   ` Nathanael Nerode
2002-09-30 11:47                 ` Alexandre Oliva
2002-09-30  9:49 ` top level: make more dependencies explicit DJ Delorie

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox