From 4944c4c7451a0f2b0c574a6f51d6d3c27c221579 Mon Sep 17 00:00:00 2001
From: Christian Engwer <christi@dune-project.org>
Date: Mon, 9 Jul 2012 12:02:47 +0000
Subject: [PATCH] [dunecontrol] sorting modules: distinguish between the MAIN
pass and DEPS/SUGS
[[Imported from SVN: r6847]]
---
lib/dunemodules.lib | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/dunemodules.lib b/lib/dunemodules.lib
index 0aed375df..1ede7b15a 100644
--- a/lib/dunemodules.lib
+++ b/lib/dunemodules.lib
@@ -239,7 +239,7 @@ sort_modules() {
for m in "$@"; do
# did we find a module file for this module?
if test "x$(eval echo \$HAVE_$m)" != "x"; then
- _sort_module $m DEPS
+ _sort_module $m MAIN
else
echo "ERROR: could not find module $(eval echo \$NAME_$m)" >&2
exit 1
@@ -251,6 +251,7 @@ sort_modules() {
for m in $MODULES; do
export SORT_DEPS_DONE_$m=""
export SORT_SUGS_DONE_$m=""
+ export SORT_MAIN_DONE_$m=""
done
}
@@ -350,7 +351,7 @@ _sort_module() {
# insert this module into the list
export SORTEDMODULES_$mode="$(eval echo \$SORTEDMODULES_$mode) $module"
export SORT_${mode}_DONE_$module=yes
- if test $mode = DEPS; then
+ if test $mode = DEPS -o $mode = MAIN; then
# it is sufficient to check that the module hasn't been handled yet,
# as dependencies are handled before suggestions
export SORTEDMODULES="$SORTEDMODULES $module"
--
GitLab