[PATCH] Fix parallel build in sim/ppc

[PATCH] Fix parallel build in sim/ppc

[Andreas Schwab]

There are a few dependencies missing in sim/ppc/Makefile that can cause a
parallel build to fail.

Andreas.

2004-11-13  Andreas Schwab  <schwab@suse.de>

	* Makefile.in (defines.h): Depend on tmp-defines.
	(hw.c hw.h): Depend on tmp-hw.
	(pk.h): Depend on tmp-pk.

--- sim/ppc/Makefile.in.~1.17.~	2004-08-05 23:14:06.000000000 +0200
+++ sim/ppc/Makefile.in	2004-11-13 14:57:50.535674611 +0100
@@ -660,6 +660,7 @@ tconfig.h:
 options.o: options.c $(CPU_H) $(OPTIONS_H) $(DEFINES_H) $(BASICS_H) $(IDECODE_H) $(INLINE) $(LIB_SRC) $(BUILT_SRC) config.status Makefile
 	$(CC) -c $(STD_CFLAGS) '-DOPCODE_RULES="@sim_opcode@"' '-DIGEN_FLAGS="$(IGEN_FLAGS)"' '-DDGEN_FLAGS="$(DGEN_FLAGS)"' $<
 
+defines.h: tmp-defines; @true
 tmp-defines: config.h Makefile
 	sed -n -e '/^#define HAVE_/s/ 1$$/",/' -e '/^#define HAVE_/s//"HAVE_/p' < config.h > tmp-defines.h
 	$(SHELL) $(srcdir)/../../move-if-change tmp-defines.h defines.h
@@ -787,6 +788,7 @@ misc.o: misc.c $(CONFIG_H) $(MISC_H)
 
 
 # real hardware
+hw.c hw.h: tmp-hw; @true
 tmp-hw: Makefile $(HW_SRC) $(srcdir)/../../move-if-change
 	# The first for loop is to remove duplicates.
 	f=""; \
@@ -838,6 +840,7 @@ hw_vm.o: hw_vm.c $(DEVICE_TABLE_H) $(CPU
 
 
 # real packages
+pk.h: tmp-pk; @true
 tmp-pk: Makefile $(PACKAGE_SRC) $(srcdir)/../../move-if-change
 	# The first for loop is to remove duplicates.
 	f=""; \

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux AG, Maxfeldstraße 5, 90409 Nürnberg, Germany
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: [PATCH] Fix parallel build in sim/ppc

[Daniel Jacobowitz]

On Sat, Nov 13, 2004 at 06:04:27PM +0100, Andreas Schwab wrote:
> There are a few dependencies missing in sim/ppc/Makefile that can cause a
> parallel build to fail.
> 
> Andreas.
> 
> 2004-11-13  Andreas Schwab  <schwab@suse.de>
> 
> 	* Makefile.in (defines.h): Depend on tmp-defines.
> 	(hw.c hw.h): Depend on tmp-hw.
> 	(pk.h): Depend on tmp-pk.

This is fine (assuming that '; @true' is portable Make; you'd know
better than I would).


-- 
Daniel Jacobowitz

Re: [PATCH] Fix parallel build in sim/ppc

[Andreas Schwab]

Daniel Jacobowitz <drow@false.org> writes:

> On Sat, Nov 13, 2004 at 06:04:27PM +0100, Andreas Schwab wrote:
>> There are a few dependencies missing in sim/ppc/Makefile that can cause a
>> parallel build to fail.
>> 
>> Andreas.
>> 
>> 2004-11-13  Andreas Schwab  <schwab@suse.de>
>> 
>> 	* Makefile.in (defines.h): Depend on tmp-defines.
>> 	(hw.c hw.h): Depend on tmp-hw.
>> 	(pk.h): Depend on tmp-pk.
>
> This is fine (assuming that '; @true' is portable Make; you'd know
> better than I would).

Putting the first command on the same line as the prerequisites is part of
the original makefile syntax, AFAIK, and supported by POSIX.

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."