Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
e3-require
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Anders Lindh Olsson
e3-require
Commits
6bcc9c13
Commit
6bcc9c13
authored
2 years ago
by
Simon Rose
Browse files
Options
Downloads
Patches
Plain Diff
Load dependent module configuration files
parent
ccba5128
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
require-ess/tools/driver.makefile
+11
-1
11 additions, 1 deletion
require-ess/tools/driver.makefile
with
11 additions
and
1 deletion
require-ess/tools/driver.makefile
+
11
−
1
View file @
6bcc9c13
...
@@ -291,6 +291,8 @@ debug::
...
@@ -291,6 +291,8 @@ debug::
@
echo
"ARCH_FILTER =
${
ARCH_FILTER
}
"
@
echo
"ARCH_FILTER =
${
ARCH_FILTER
}
"
@
echo
"EXCLUDE_ARCHS =
${
EXCLUDE_ARCHS
}
"
@
echo
"EXCLUDE_ARCHS =
${
EXCLUDE_ARCHS
}
"
@
echo
"LIBVERSION =
${
LIBVERSION
}
"
@
echo
"LIBVERSION =
${
LIBVERSION
}
"
@
echo
"E3_SITEMODS_PATH =
${
E3_SITEMODS_PATH
}
"
@
echo
"EPICS_MODULES =
${
EPICS_MODULES
}
"
# Create e.g. build-$(T_A) rules for each architecture, so that we can just do
# Create e.g. build-$(T_A) rules for each architecture, so that we can just do
# build: build-arch1 build-arch2
# build: build-arch1 build-arch2
...
@@ -538,6 +540,10 @@ ifneq ($(MODULELIB),)
...
@@ -538,6 +540,10 @@ ifneq ($(MODULELIB),)
LIBOBJS
+=
$(
addsuffix
$(
OBJ
)
,
$(
basename
${
VERSIONFILE
}))
LIBOBJS
+=
$(
addsuffix
$(
OBJ
)
,
$(
basename
${
VERSIONFILE
}))
endif
# MODULELIB
endif
# MODULELIB
MODULE_RULES
=
${
CFGS:%
=
../%
}
MODULE_RULES
+=
$(
foreach m,
$(
REQ
)
,
$(
wildcard
$(
E3_SITEMODS_PATH
)
/
$m
/
$($(
m
)
_VERSION
)
/cfg/RULES
*
))
MODULE_RULES
+=
$(
foreach m,
$(
REQ
)
,
$(
wildcard
$(
EPICS_MODULES
)
/
$m
/
$($(
m
)
_VERSION
)
/cfg/RULES
*
))
debug
::
debug
::
@
echo
"===================== Pass 3: Build directory ====================="
@
echo
"===================== Pass 3: Build directory ====================="
@
echo
"BUILDCLASSES =
${
BUILDCLASSES
}
"
@
echo
"BUILDCLASSES =
${
BUILDCLASSES
}
"
...
@@ -561,6 +567,7 @@ debug::
...
@@ -561,6 +567,7 @@ debug::
@
echo
"TEMPLS =
${
TEMPLS
}
"
@
echo
"TEMPLS =
${
TEMPLS
}
"
@
echo
"LIBVERSION =
${
LIBVERSION
}
"
@
echo
"LIBVERSION =
${
LIBVERSION
}
"
@
echo
"MODULE_LOCATION =
${
MODULE_LOCATION
}
"
@
echo
"MODULE_LOCATION =
${
MODULE_LOCATION
}
"
@
echo
"MODULE_RULES =
${
MODULE_RULES
}
"
build
:
MODULEINFOS
build
:
MODULEINFOS
build
:
${MODULEDBD}
build
:
${MODULEDBD}
...
@@ -574,7 +581,10 @@ INSTALL_LOADABLE_SHRLIBS=
...
@@ -574,7 +581,10 @@ INSTALL_LOADABLE_SHRLIBS=
# We ony want to include ${BASERULES} from EPICS base if we are /not/ in debug
# We ony want to include ${BASERULES} from EPICS base if we are /not/ in debug
# mode. Including this causes all of the source files to be compiled!
# mode. Including this causes all of the source files to be compiled!
ifeq
(,$(findstring debug,${MAKECMDGOALS}))
ifeq
(,$(findstring debug,${MAKECMDGOALS}))
include
${BASERULES}
include
${BASERULES}
ifneq
($(strip $(MODULE_RULES)),)
include
$(MODULE_RULES)
endif
endif
endif
# Fix incompatible release rules.
# Fix incompatible release rules.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment