kbuild: Fix warnings and other buglets

o Add a + to $(MAKEBOOT), so that make knows that it's a recursive make
  invocation.
o For files which are generated like .map -> .c -> .o,
  add an explicit dependency for .c -> .o.
  Otherwise, make sees the .c as an intermediate object and removes it,
  causing an unnecessary recompilation at next invocation.

diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index c661f8b684e45e8d48bbb6256614b47b98c2111f..164f2ebc762b17e76bf940b93a3f135bed9ce75c 100644 (file)
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -102,7 +102,7 @@ SUBDIRS     += arch/i386/pci
 DRIVERS        += arch/i386/pci/pci.o
 endif
 
-MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot
+MAKEBOOT = +$(MAKE) -C arch/$(ARCH)/boot
 
 vmlinux: arch/i386/vmlinux.lds
 

diff --git a/drivers/acorn/char/Makefile b/drivers/acorn/char/Makefile
index 2d146b1ef77cd3fdc0b499841f248ea0c0c3efa8..06acf0a7ea75b404524933c3b38b6181d48318e1 100644 (file)
--- a/drivers/acorn/char/Makefile
+++ b/drivers/acorn/char/Makefile
@@ -20,6 +20,8 @@ obj-y         += $(obj-$(MACHINE))
 
 include $(TOPDIR)/Rules.make
 
+$(obj)/defkeymap-acorn.o: $(obj)/defkeymap-acorn.c
+
 # Uncomment if you're changing the keymap and have an appropriate
 # loadkeys version for the map. By default, we'll use the shipped
 # versions.
@@ -28,6 +30,6 @@ include $(TOPDIR)/Rules.make
 ifdef GENERATE_KEYMAP
 
 $(obj)/defkeymap-acorn.c: $(obj)/%.c: $(src)/%.map
-       $(LOADKEYS) --mktable $< > $@
+       loadkeys --mktable $< > $@
 
 endif

diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 23c5ee56349509ec2a5704481a4afde1238f90da..ed74453f7c64e11999555fc8587013ddb897402e 100644 (file)
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -219,6 +219,10 @@ include $(TOPDIR)/Rules.make
 $(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE) $(obj)/conmakehash
        $(obj)/conmakehash $< > $@
 
+$(obj)/defkeymap.o:  $(obj)/defkeymap.c
+
+$(obj)/qtronixmap.o: $(obj)/qtronixmap.c
+
 # Uncomment if you're changing the keymap and have an appropriate
 # loadkeys version for the map. By default, we'll use the shipped
 # versions.
@@ -227,7 +231,7 @@ $(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE) $(obj)/conmakehash
 ifdef GENERATE_KEYMAP
 
 $(obj)/defkeymap.c $(obj)/qtronixmap.c: $(obj)/%.c: $(src)/%.map
-       $(LOADKEYS) --mktable $< > $@.tmp
+       loadkeys --mktable $< > $@.tmp
        sed -e 's/^static *//' $@.tmp > $@
        rm $@.tmp
 

diff --git a/drivers/tc/Makefile b/drivers/tc/Makefile
index 5d9563a9385533ebb5570129c6e5d0719e9f5b9a..c7f242db75cc84efe6dc46faa7334d8461df19d1 100644 (file)
--- a/drivers/tc/Makefile
+++ b/drivers/tc/Makefile
@@ -15,6 +15,8 @@ obj-$(CONFIG_VT) += lk201.o lk201-map.o lk201-remap.o
 
 include $(TOPDIR)/Rules.make
 
+$(obj)/lk201-map.o: $(obj)/lk201-map.c
+
 # Uncomment if you're changing the keymap and have an appropriate
 # loadkeys version for the map. By default, we'll use the shipped
 # versions.
@@ -23,6 +25,6 @@ include $(TOPDIR)/Rules.make
 ifdef GENERATE_KEYMAP
 
 $(obj)/lk201-map.c: $(obj)/%.c: $(src)/%.map
-       $(LOADKEYS) --mktable $< > $@
+       loadkeys --mktable $< > $@
 
 endif