summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorOlivier Matz <olivier.matz@6wind.com>2017-03-24 14:21:31 +0100
committerThomas Monjalon <thomas.monjalon@6wind.com>2017-03-27 23:28:43 +0200
commitfeb9f680cd2c1df3d47bf4c05dc872467176e1e3 (patch)
treecaef9798533f2249ad24668b4e6d21d247c792a1 /examples
parent5b2976c718e0717f5e1b39b50ac71fb2ce80e47c (diff)
downloaddpdk-feb9f680cd2c1df3d47bf4c05dc872467176e1e3.zip
dpdk-feb9f680cd2c1df3d47bf4c05dc872467176e1e3.tar.gz
dpdk-feb9f680cd2c1df3d47bf4c05dc872467176e1e3.tar.xz
mk: optimize directory dependencies
Before this patch, the management of dependencies between directories had several issues: - the generation of .depdirs, done at configuration is slow: it can take more than one minute on some slow targets (usually ~10s on a standard PC without -j). - for instance, it is possible to express a dependency like: - app/foo depends on lib/librte_foo - and lib/librte_foo depends on app/bar But this won't work because the directories are traversed with a depth-first algorithm, so we have to choose between doing 'app' before or after 'lib'. - the script depdirs-rule.sh is too complex. - we cannot use "make -d" for debug, because the output of make is used for the generation of .depdirs. This patch moves the DEPDIRS-* variables in the upper Makefile, making the dependencies much easier to calculate. A DEPDIRS variable is still used to process library dependencies in LDLIBS. After this commit, "make config" is almost immediate. Signed-off-by: Olivier Matz <olivier.matz@6wind.com> Tested-by: Robin Jarry <robin.jarry@6wind.com> Tested-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/ethtool/Makefile3
-rw-r--r--examples/ethtool/lib/Makefile4
2 files changed, 3 insertions, 4 deletions
diff --git a/examples/ethtool/Makefile b/examples/ethtool/Makefile
index 995cd25..30b42b7 100644
--- a/examples/ethtool/Makefile
+++ b/examples/ethtool/Makefile
@@ -46,4 +46,7 @@ else
DIRS-y += lib ethtool-app
endif
+DEPDIRS-ethtool-app := lib
+DEPDIRS-lib := librte_eal librte_ether
+
include $(RTE_SDK)/mk/rte.extsubdir.mk
diff --git a/examples/ethtool/lib/Makefile b/examples/ethtool/lib/Makefile
index 46b1b3a..197c1d6 100644
--- a/examples/ethtool/lib/Makefile
+++ b/examples/ethtool/lib/Makefile
@@ -58,8 +58,4 @@ ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_PMD),y)
LDLIBS += -lrte_pmd_ixgbe
endif
-# internal dependencies
-DEPDIRS-y += lib/librte_eal
-DEPDIRS-y += lib/librte_ether
-
include $(RTE_SDK)/mk/rte.extlib.mk