lib/Makefile: Fix oid_registry build dependency

rtg-canonical · rustyrussell · commit 527897ccd968 · 2012-12-06T17:25:01.000+10:30
It is $(obj)/oid_registry.o that is dependent on $(obj)/oid_registry_data.c.
The object file cannot be built until $(obj)/oid_registry_data.c has been
generated.

A periodic and hard to reproduce parallel build failure is due to
this incorrect lib/Makefile dependency. The compile error is completely
disingenuous.

  GEN     lib/oid_registry_data.c
Compiling 49 OIDs
  CC      lib/oid_registry.o
gcc: error: lib/oid_registry.c: No such file or directory
gcc: fatal error: no input files
compilation terminated.
make[3]: *** [lib/oid_registry.o] Error 4

Cc: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Cc: Akinobu Mita &lt;akinobu.mita@gmail.com&gt;
Cc: Michel Lespinasse &lt;walken@google.com&gt;
Cc: David Howells &lt;dhowells@redhat.com&gt;
Cc: "David S. Miller" &lt;davem@davemloft.net&gt;
Signed-off-by: Tim Gardner &lt;tim.gardner@canonical.com&gt;
Signed-off-by: Rusty Russell &lt;rusty@rustcorp.com.au&gt;
diff --git a/lib/Makefile b/lib/Makefile
@@ -163,7 +163,7 @@ $(obj)/crc32table.h: $(obj)/gen_crc32table
 #
 obj-$(CONFIG_OID_REGISTRY) += oid_registry.o
 
-$(obj)/oid_registry.c: $(obj)/oid_registry_data.c
+$(obj)/oid_registry.o: $(obj)/oid_registry_data.c
 
 $(obj)/oid_registry_data.c: $(srctree)/include/linux/oid_registry.h \
 			    $(src)/build_OID_registry

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ $(obj)/crc32table.h: $(obj)/gen_crc32table`
`163`	`163`	`#`
`164`	`164`	`obj-$(CONFIG_OID_REGISTRY) += oid_registry.o`
`165`	`165`
`166`		`-$(obj)/oid_registry.c: $(obj)/oid_registry_data.c`
	`166`	`+$(obj)/oid_registry.o: $(obj)/oid_registry_data.c`
`167`	`167`
`168`	`168`	`$(obj)/oid_registry_data.c: $(srctree)/include/linux/oid_registry.h \`
`169`	`169`	`$(src)/build_OID_registry`