Re: [patch 2/6] Merge target_signal definitions to one place

[Pedro Alves <pedro@codesourcery.com>]

On Saturday 31 July 2010 05:22:23, Jan Kratochvil wrote:
> On Sat, 31 Jul 2010 01:23:21 +0200, Pedro Alves wrote:
> > Thanks.  In that case, you should also update the server.o rule, which
> > depends on server.c, which now depends on signals.def.
> 
> And I missed its dependency on signals.h having dependency signals.def is not
> enough wrt future changes, OK.
> 

I am very sorry, I meant signals.o -> signals.c -> signals.def, not
server.*.  :-/  I don't know why I wrote server.o,server.c.  :-(
server.c's dependency is always through signals.h, which is included
by server.h, and $(server_h) is depending on server.def, so that
was fine.  It's signals.c that has a direct include of signals.def.
Mainly a pedantic correctness issue, since signals.c is depending
on signals.h...

I've applied the patch below.

-- 
Pedro Alves

2010-07-31  Pedro Alves  <pedro@codesourcery.com>

	* Makefile.in (signals_h): New.
	(server_h): Depend on it.
	(server.o): Don't depend on $(signals_def).
	(signals.o): Depend on $(signals_def).

---
 gdb/gdbserver/Makefile.in |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Index: src/gdb/gdbserver/Makefile.in
===================================================================
--- src.orig/gdb/gdbserver/Makefile.in	2010-07-31 08:40:49.000000000 +0100
+++ src/gdb/gdbserver/Makefile.in	2010-07-31 08:53:16.000000000 +0100
@@ -293,9 +293,10 @@ regdat_sh = $(srcdir)/../regformats/regd
 regdef_h = $(srcdir)/../regformats/regdef.h
 regcache_h = $(srcdir)/regcache.h
 signals_def = $(srcdir)/../../include/gdb/signals.def
+signals_h = $(srcdir)/../../include/gdb/signals.h $(signals_def)
 server_h = $(srcdir)/server.h $(regcache_h) config.h $(srcdir)/target.h \
 		$(srcdir)/mem-break.h $(srcdir)/../common/gdb_signals.h \
-		$(srcdir)/../../include/gdb/signals.h $(signals_def)
+		$(signals_h)
 
 linux_low_h = $(srcdir)/linux-low.h
 
@@ -335,14 +336,14 @@ mem-break.o: mem-break.c $(server_h)
 proc-service.o: proc-service.c $(server_h) $(gdb_proc_service_h)
 regcache.o: regcache.c $(server_h) $(regdef_h)
 remote-utils.o: remote-utils.c terminal.h $(server_h)
-server.o: server.c $(server_h) $(signals_def)
+server.o: server.c $(server_h)
 target.o: target.c $(server_h)
 thread-db.o: thread-db.c $(server_h) $(linux_low_h) $(gdb_proc_service_h)
 tracepoint.o: tracepoint.c $(server_h)
 utils.o: utils.c $(server_h)
 gdbreplay.o: gdbreplay.c config.h
 
-signals.o: ../common/signals.c $(server_h)
+signals.o: ../common/signals.c $(server_h) $(signals_def)
 	$(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $< -DGDBSERVER
 
 memmem.o: ../gnulib/memmem.c