[PATCH 16/28] kbuild: create output directory for hostprogs with O=.. build

From: Sam Ravnborg <[email protected]>

hostprogs-y only supported creating output directory for the final
program. Extend this to also cover the situation where a .o
file (used when host program is made from compositie objects) is
locate in another directory.
First user of this is the built-in lxdialog that.

Signed-off-by: Sam Ravnborg <[email protected]>
---
 scripts/Makefile.host |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/scripts/Makefile.host b/scripts/Makefile.host
index 060f4c5..d74dd0f 100644
--- a/scripts/Makefile.host
+++ b/scripts/Makefile.host
@@ -32,11 +32,6 @@ # Note: Shared libraries consisting of C
 
 __hostprogs := $(sort $(hostprogs-y) $(hostprogs-m))
 
-# hostprogs-y := tools/build may have been specified. Retreive directory
-host-objdirs := $(foreach f,$(__hostprogs), $(if $(dir $(f)),$(dir $(f))))
-host-objdirs := $(strip $(sort $(filter-out ./,$(host-objdirs))))
-
-
 # C code
 # Executables compiled from a single .c file
 host-csingle	:= $(foreach m,$(__hostprogs),$(if $($(m)-objs),,$(m)))
@@ -65,6 +60,21 @@ host-cobjs	:= $(filter-out %.so,$(host-c
 #Object (.o) files used by the shared libaries
 host-cshobjs	:= $(sort $(foreach m,$(host-cshlib),$($(m:.so=-objs))))
 
+# output directory for programs/.o files
+# hostprogs-y := tools/build may have been specified. Retreive directory
+host-objdirs := $(foreach f,$(__hostprogs), $(if $(dir $(f)),$(dir $(f))))
+# directory of .o files from prog-objs notation
+host-objdirs += $(foreach f,$(host-cmulti),                  \
+                    $(foreach m,$($(f)-objs),                \
+                        $(if $(dir $(m)),$(dir $(m)))))
+# directory of .o files from prog-cxxobjs notation
+host-objdirs += $(foreach f,$(host-cxxmulti),                  \
+                    $(foreach m,$($(f)-cxxobjs),                \
+                        $(if $(dir $(m)),$(dir $(m)))))
+
+host-objdirs := $(strip $(sort $(filter-out ./,$(host-objdirs))))
+
+
 __hostprogs     := $(addprefix $(obj)/,$(__hostprogs))
 host-csingle	:= $(addprefix $(obj)/,$(host-csingle))
 host-cmulti	:= $(addprefix $(obj)/,$(host-cmulti))
@@ -75,6 +85,7 @@ host-cshlib	:= $(addprefix $(obj)/,$(hos
 host-cshobjs	:= $(addprefix $(obj)/,$(host-cshobjs))
 host-objdirs    := $(addprefix $(obj)/,$(host-objdirs))
 
+$(warning host-objdirs=$(host-objdirs))
 obj-dirs += $(host-objdirs)
 
 #####
-- 
1.4.1

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

---

• Follow-Ups:
  • [PATCH 17/28] kbuild: remove debug left-over from Makefile.host
    • From: [email protected]

• References:
  • [PATCH 1/28] kconfig: support DOS line endings
    • From: [email protected]
  • [PATCH 2/28] kbuild: consistently decide when to rebuild a target
    • From: [email protected]
  • [PATCH 3/28] kbuild: add unifdef
    • From: [email protected]
  • [PATCH 4/28] kbuild: replace use of strlcpy with a dedicated implmentation in unifdef
    • From: [email protected]
  • [PATCH 5/28] kbuild: use in-kernel unifdef
    • From: [email protected]
  • [PATCH 6/28] remove RPM_BUILD_ROOT from asm-offsets.h
    • From: [email protected]
  • [PATCH 7/28] kconfig: linguistic fixes for Documentation/kbuild/kconfig-language.txt
    • From: [email protected]
  • [PATCH 8/28] kbuild: linguistic fixes for Documentation/kbuild/modules.txt
    • From: [email protected]
  • [PATCH 9/28] kbuild: linguistic fixes for Documentation/kbuild/makefiles.txt
    • From: [email protected]
  • [PATCH 10/28] kbuild: ignore references from ".pci_fixup" to ".init.text"
    • From: [email protected]
  • [PATCH 11/28] kbuild: modpost on vmlinux regardless of CONFIG_MODULES
    • From: [email protected]
  • [PATCH 12/28] kbuild: make V=2 tell why a target is rebuild
    • From: [email protected]
  • [PATCH 13/28] kbuild: make -rR is now default
    • From: [email protected]
  • [PATCH 14/28] kbuild: preperly align SYSMAP output
    • From: [email protected]
  • [PATCH 15/28] kbuild: add missing return statement in modpost.c:secref_whitelist()
    • From: [email protected]

• Prev by Date: [PATCH 23/28] kbuild: Extend kbuild/defconfig tags support to exuberant ctags
• Next by Date: [PATCH 27/28] dontdiff: add utsrelease.h
• Previous by thread: [PATCH 15/28] kbuild: add missing return statement in modpost.c:secref_whitelist()
• Next by thread: [PATCH 17/28] kbuild: remove debug left-over from Makefile.host
• Index(es):
  • Date
  • Thread

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]