[U-Boot] [PATCH v9 29/38] examples: move api/ and standalone/ entry to examples/Makefile

Masahiro Yamada
2014-02-04T08:24:36Z

Makefile | 5 +----
examples/Makefile | 9 +++++++++
examples/api/Makefile | 4 ----
examples/standalone/Makefile | 4 ----
4 files changed, 10 insertions(+), 12 deletions(-)
create mode 100644 examples/Makefile

diff --git a/Makefile b/Makefile
index a245370..f3e62b4 100644
--- a/Makefile
+++ b/Makefile
@@ -570,11 +570,8 @@ SUBDIRS = $(SUBDIR_TOOLS)

.PHONY : $(SUBDIRS) $(VERSION_FILE) $(TIMESTAMP_FILE)

-SUBDIR_EXAMPLES-y := examples/standalone
-SUBDIR_EXAMPLES-$(CONFIG_API) += examples/api
-ifndef CONFIG_SANDBOX
+SUBDIR_EXAMPLES-y := examples
SUBDIRS += $(SUBDIR_EXAMPLES-y)
-endif

#########################################################################
# U-Boot objects....order is important (i.e. start must be first)
diff --git a/examples/Makefile b/examples/Makefile
new file mode 100644
index 0000000..18d008e
--- /dev/null
+++ b/examples/Makefile
@@ -0,0 +1,9 @@
+ifndef CONFIG_SANDBOX
+
+ifdef FTRACE
+subdir-ccflags-y += -finstrument-functions -DFTRACE
+endif
+
+subdir-y += standalone
+subdir-$(CONFIG_API) += api
+endif
diff --git a/examples/api/Makefile b/examples/api/Makefile
index 8b79886..09475f8 100644
--- a/examples/api/Makefile
+++ b/examples/api/Makefile
@@ -4,10 +4,6 @@
# SPDX-License-Identifier: GPL-2.0+
#

-ifdef FTRACE
-ccflags-y += -finstrument-functions -DFTRACE
-endif
-
ifeq ($(ARCH),powerpc)
LOAD_ADDR = 0x40000
endif
diff --git a/examples/standalone/Makefile b/examples/standalone/Makefile
index 90e173b..47c9d54 100644
--- a/examples/standalone/Makefile
+++ b/examples/standalone/Makefile
@@ -5,10 +5,6 @@
# SPDX-License-Identifier: GPL-2.0+
#

-ifdef FTRACE
-ccflags-y += -finstrument-functions -DFTRACE
-endif
-
extra-y := hello_world
extra-$(CONFIG_SMC91111) += smc91111_eeprom
extra-$(CONFIG_SMC911X) += smc911x_eeprom
--
1.8.3.2