All of lore.kernel.org
 help / color / mirror / Atom feed
From: Masahiro Yamada <yamada.m@jp.panasonic.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v8 02/38] Makefile.host.tmp: add a new script to refactor tools
Date: Wed, 29 Jan 2014 21:25:59 +0900	[thread overview]
Message-ID: <1390998395-18567-3-git-send-email-yamada.m@jp.panasonic.com> (raw)
In-Reply-To: <1390998395-18567-1-git-send-email-yamada.m@jp.panasonic.com>

This commit adds scripts/Makefile.host.tmp which will
be used in the next commit to convert makefiles
under tools/ directory to Kbuild style.

Notice this script, scripts/Makefile.host.tmp
is temporary.

When switching over to real Kbuild,
it will be replaced with scripts/Makefile.host of Linux Kernel.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---

Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None

 scripts/Makefile.build    | 17 ++++++++++---
 scripts/Makefile.host.tmp | 61 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+), 3 deletions(-)
 create mode 100644 scripts/Makefile.host.tmp

diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index e3354aa..c451fbf 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -7,15 +7,23 @@ include $(TOPDIR)/config.mk
 LIB := $(obj)built-in.o
 LIBGCC = $(obj)libgcc.o
 SRCS :=
+subdir-y :=
+obj-dirs :=
 
 include Makefile
 
+# Do not include host rules unless needed
+ifneq ($(hostprogs-y)$(hostprogs-m),)
+include $(SRCTREE)/scripts/Makefile.host.tmp
+endif
+
 # Going forward use the following
 obj-y := $(sort $(obj-y))
 extra-y := $(sort $(extra-y))
+always := $(sort $(always))
 lib-y := $(sort $(lib-y))
 
-subdir-y 	:= $(patsubst %/,%,$(filter %/, $(obj-y)))
+subdir-y 	+= $(patsubst %/,%,$(filter %/, $(obj-y)))
 obj-y		:= $(patsubst %/, %/built-in.o, $(obj-y))
 subdir-obj-y	:= $(filter %/built-in.o, $(obj-y))
 subdir-obj-y	:= $(addprefix $(obj),$(subdir-obj-y))
@@ -25,7 +33,8 @@ SRCS	+= $(wildcard $(obj-y:.o=.c) $(obj-y:.o=.S) $(lib-y:.o=.c) \
 OBJS	:= $(addprefix $(obj),$(obj-y))
 
 # $(obj-dirs) is a list of directories that contain object files
-obj-dirs := $(dir $(OBJS))
+
+obj-dirs += $(dir $(OBJS))
 
 # Create directories for object files if directory does not exist
 # Needed when obj-y := dir/file.o syntax is used
@@ -33,7 +42,7 @@ _dummy := $(foreach d,$(obj-dirs), $(shell [ -d $(d) ] || mkdir -p $(d)))
 
 LGOBJS := $(addprefix $(obj),$(sort $(lib-y)))
 
-all: $(LIB) $(addprefix $(obj),$(extra-y))
+all: $(LIB) $(addprefix $(obj),$(extra-y) $(always)) $(subdir-y)
 
 $(LIB):	$(obj).depend $(OBJS)
 	$(call cmd_link_o_target, $(OBJS))
@@ -48,7 +57,9 @@ endif
 ifneq ($(subdir-obj-y),)
 # Descending
 $(subdir-obj-y): $(subdir-y)
+endif
 
+ifneq ($(subdir-y),)
 $(subdir-y): FORCE
 	$(MAKE) -C $@ -f $(TOPDIR)/scripts/Makefile.build
 endif
diff --git a/scripts/Makefile.host.tmp b/scripts/Makefile.host.tmp
new file mode 100644
index 0000000..4b57846
--- /dev/null
+++ b/scripts/Makefile.host.tmp
@@ -0,0 +1,61 @@
+
+__hostprogs := $(sort $(hostprogs-y) $(hostprogs-m))
+
+# C code
+# Executables compiled from a single .c file
+host-csingle	:= $(foreach m,$(__hostprogs),$(if $($(m)-objs),,$(m)))
+
+# C executables linked based on several .o files
+host-cmulti	:= $(foreach m,$(__hostprogs),$(if $($(m)-objs),$(m)))
+
+# Object (.o) files compiled from .c files
+host-cobjs	:= $(sort $(foreach m,$(__hostprogs),$($(m)-objs)))
+
+# output directory for programs/.o files
+# hostprogs-y := tools/build may have been specified. Retrieve 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)))))
+
+host-objdirs := $(strip $(sort $(filter-out ./,$(host-objdirs))))
+
+__hostprogs     := $(addprefix $(obj),$(__hostprogs))
+host-csingle	:= $(addprefix $(obj),$(host-csingle))
+host-cmulti	:= $(addprefix $(obj),$(host-cmulti))
+host-cobjs	:= $(addprefix $(obj),$(host-cobjs))
+host-objdirs    := $(addprefix $(obj),$(host-objdirs))
+
+obj-dirs += $(host-objdirs)
+
+#####
+# Handle options to gcc. Support building with separate output directory
+
+_hostc_flags   = $(HOSTCFLAGS)   $(HOST_EXTRACFLAGS)   \
+                 $(HOSTCFLAGS_$(basetarget).o)
+
+# Find all -I options and call addtree
+flags = $(foreach o,$($(1)),$(if $(filter -I%,$(o)),$(call addtree,$(o)),$(o)))
+
+ifeq ($(OBJTREE),$(SRCTREE))
+__hostc_flags	= $(_hostc_flags)
+else
+__hostc_flags	= -I$(obj) $(call flags,_hostc_flags)
+endif
+
+hostc_flags    = $(__hostc_flags)
+
+#####
+# Compile programs on the host
+
+$(host-csingle): $(obj)%: %.c
+	$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) $(HOSTLDFLAGS) $(HOSTCFLAGS_$(@F)) $(HOSTCFLAGS_$(BCURDIR)) -o $@ $<
+
+$(host-cmulti): $(obj)%: $(host-cobjs)
+	$(HOSTCC) $(HOSTLDFLAGS) -o $@ $(addprefix $(obj),$($(@F)-objs)) $(HOSTLOADLIBES_$(@F))
+
+$(host-cobjs): $(obj)%.o: %.c
+	$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS_$(@F)) $(HOSTCFLAGS_$(BCURDIR)) -o $@ $< -c
+
+targets += $(host-csingle)  $(host-cmulti) $(host-cobjs)
-- 
1.8.3.2

  parent reply	other threads:[~2014-01-29 12:25 UTC|newest]

Thread overview: 58+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-29 12:25 [U-Boot] [PATCH v8 0/38] Switch over to real Kbuild Masahiro Yamada
2014-01-29 12:25 ` [U-Boot] [PATCH v8 01/38] .gitignore: ingore files generated by Kbuild Masahiro Yamada
2014-01-29 12:25 ` Masahiro Yamada [this message]
2014-01-29 12:26 ` [U-Boot] [PATCH v8 03/38] tools: convert makefiles to kbuild style Masahiro Yamada
2014-01-29 12:26 ` [U-Boot] [PATCH v8 04/38] board: samsung: refactor host programs Masahiro Yamada
2014-01-29 12:26 ` [U-Boot] [PATCH v8 05/38] examples: Use scripts/Makefile.build Masahiro Yamada
2014-01-29 12:26 ` [U-Boot] [PATCH v8 06/38] nand-spl: " Masahiro Yamada
2014-01-29 12:26 ` [U-Boot] [PATCH v8 07/38] Makfile: move suffix rules to Makefile.build Masahiro Yamada
2014-01-29 12:26 ` [U-Boot] [PATCH v8 08/38] Makefile: move some variable definitions to the top Makefile Masahiro Yamada
2014-01-29 12:26 ` [U-Boot] [PATCH v8 09/38] Makefile: move BFD_ROOT_DIR to tools/gdb/Makefile Masahiro Yamada
2014-01-29 12:26 ` [U-Boot] [PATCH v8 10/38] kbuild: import Kbuild.include from linux v3.13 tag Masahiro Yamada
2014-01-29 12:26 ` [U-Boot] [PATCH v8 11/38] kbuild: Use Kbuild.include Masahiro Yamada
2014-01-29 12:26 ` [U-Boot] [PATCH v8 12/38] Makefile: move more flags to the top Makefile Masahiro Yamada
2014-01-29 12:26 ` [U-Boot] [PATCH v8 13/38] Makefile: refactor include path settings Masahiro Yamada
2014-01-29 12:26 ` [U-Boot] [PATCH v8 14/38] Makefile: move more stuff to top Makefile Masahiro Yamada
2014-01-29 12:26 ` [U-Boot] [PATCH v8 15/38] Makefile: move some flags to spl/Makefile Masahiro Yamada
2014-01-29 12:26 ` [U-Boot] [PATCH v8 16/38] Makefile: move some flags to examples makefiles Masahiro Yamada
2014-01-29 12:26 ` [U-Boot] [PATCH v8 17/38] kbuild: change out-of-tree build Masahiro Yamada
2014-01-29 12:26 ` [U-Boot] [PATCH v8 18/38] kbuild: add dummy obj-y to create built-in.o Masahiro Yamada
2014-01-29 12:26 ` [U-Boot] [PATCH v8 19/38] Makefile: rename scripts/Makefile.build to scripts/Makefile.build.tmp Masahiro Yamada
2014-01-29 12:26 ` [U-Boot] [PATCH v8 20/38] kbuild: import more build scripts from Linux v3.13 tag Masahiro Yamada
2014-01-29 12:26 ` [U-Boot] [PATCH v8 21/38] kbuild: use Linux Kernel build scripts Masahiro Yamada
2014-01-29 12:26 ` [U-Boot] [PATCH v8 22/38] kbuild: delete temporary " Masahiro Yamada
2014-01-29 12:26 ` [U-Boot] [PATCH v8 23/38] kbuild: move some lines to more suitable place Masahiro Yamada
2014-01-29 12:26 ` [U-Boot] [PATCH v8 24/38] kbuild: convert some make rules to Kbuild style Masahiro Yamada
2014-01-29 12:26 ` [U-Boot] [PATCH v8 25/38] kbuild: move include directives of board configuration files Masahiro Yamada
2014-01-29 12:26 ` [U-Boot] [PATCH v8 26/38] kbuild: generate {spl, tpl}-autoconf.mk only when it is necessary Masahiro Yamada
2014-01-29 12:26 ` [U-Boot] [PATCH v8 27/38] Makefile: remove a cleaning target "tidy" Masahiro Yamada
2014-01-29 12:26 ` [U-Boot] [PATCH v8 28/38] kbuild: change the top Makefile to more Kbuild-ish structure Masahiro Yamada
2014-01-29 12:26 ` [U-Boot] [PATCH v8 29/38] examples: move api/ and standalone/ entry to examples/Makefile Masahiro Yamada
2014-01-29 12:26 ` [U-Boot] [PATCH v8 30/38] kbuild: refactor Makefile and spl/Makefile more Masahiro Yamada
2014-01-29 12:26 ` [U-Boot] [PATCH v8 31/38] Makefile: Do not pass MTD_VERSION from the top Makefile Masahiro Yamada
2014-01-29 12:26 ` [U-Boot] [PATCH v8 32/38] Makefile: refactor tools-all targets Masahiro Yamada
2014-01-29 12:26 ` [U-Boot] [PATCH v8 33/38] kbuild: use scripts/Makefile.clean Masahiro Yamada
2014-01-29 12:26 ` [U-Boot] [PATCH v8 34/38] kbuild: support simultaneous board configuration and "make all" Masahiro Yamada
2014-01-29 12:26 ` [U-Boot] [PATCH v8 35/38] kbuild: check clean source and generate Makefile for out-of-tree build Masahiro Yamada
2014-01-29 12:26 ` [U-Boot] [PATCH v8 36/38] board: sandburst: delete FORCEBUILD Masahiro Yamada
2014-01-29 12:26 ` [U-Boot] [PATCH v8 37/38] kbuild: Do not generate .*.su files at the top directory Masahiro Yamada
2014-01-29 12:26 ` [U-Boot] [PATCH v8 38/38] tools/env: cross-compile fw_printenv without setting HOSTCC Masahiro Yamada
2014-01-30 21:35 ` [U-Boot] [PATCH v8 0/38] Switch over to real Kbuild Andreas Bießmann
2014-01-31  1:48   ` Masahiro Yamada
2014-01-31  9:12 ` Masahiro Yamada
2014-02-01 12:09   ` Tom Rini
2014-01-31 20:35 ` Simon Glass
2014-02-03  3:46   ` Masahiro Yamada
2014-02-06 21:10     ` Tom Rini
2014-02-16  1:30       ` Simon Glass
2014-02-16  2:51         ` Simon Glass
2014-02-18  9:02           ` Masahiro Yamada
2014-02-19  6:09             ` Simon Glass
2014-02-19  9:51               ` Masahiro Yamada
2014-02-19 17:28             ` Tom Rini
2014-02-20  8:25               ` Masahiro Yamada
2014-02-20 13:29                 ` Tom Rini
2014-02-18 14:44         ` Tom Rini
2014-02-19  1:57           ` Masahiro Yamada
2014-02-19 12:54             ` Tom Rini
2014-02-19 13:28               ` Masahiro Yamada

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1390998395-18567-3-git-send-email-yamada.m@jp.panasonic.com \
    --to=yamada.m@jp.panasonic.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.