On Wed, 2004-11-17 at 15:03, Richard Earnshaw wrote:
> On Tue, 2004-11-16 at 15:35, Hans-Peter Nilsson wrote:
> > > From: Richard Earnshaw <rearnsha@gcc.gnu.org>
> > > Cc: gdb-patches@sources.redhat.com
> > 
> > > Here's my proposed patch:
> > > 
> > > <date> Richard Earnshaw  <rearnsha@arm.com>
> > > 
> > > 	* Make-common.in (sim_basics_headers): New.
> > > 	(sim_main_headers): Move basics headers and sub-dependencies
> > > 	to sim_basics_headers).  Add the dependencies through that.
> > > 	(sim-load.c): Depend on sim_basics_headers not 
> > > 	sim_main_headers.
> > > 
> > > OK?
> > 
> > I was preparing almost the same patch, just naming the macro
> > sim_basics_h_headers!
> > 
> > BTW, you shouldn't have edited out sim-arange.c, a gcc -MM says
> > it's actually included from sim-basics.h (and from looking at
> > the code).  For the same reason sim-assert.h should be in
> > sim_basics_headers.  Maybe all files should use the
> > $(sim-assert_h) et al macros.
> 
> The list of headers I used was the list directly in sim-basics.h.  I
> only moved existing includes from sim_main_headers and then added
> further ones at the first level that were obviously missing.  So if it's
> wrong now it was wrong before.
> 
> The best way to do all this is to define a series of macros
> sim-basics_h, sim-assert-h etc, and for each of these to list the macros
> that form the direct dependencies.
> 
> But that's a fair bit of work... :-(  ... and it needs active
> maintenance to keep it up to date.
> 
> R.

Attached is a revised version of the patch that implements this for
sim-*.h.  Really further work should be done so that the C files depend
on the correct headers rather than all depending on sim_main_headers.

R.