commit b1d364a54260a75a4590f24e50f5dd449389a22c
parent b1ff6ec81fa904e37cf85236fb23b575332aed82
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Tue, 23 May 2023 21:35:09 +0200
Update the way the Makefile to be executed is generated
Previously, a list of projects was first declared. Then, the projects to
be built from this list were explicitly defined via the "build"
function, its dependencies were then installed as a side effect. In this
commit, we remove this 2-step procedure: when declaring a project, it is
now automatically registered as a project to be installed, the
dependencies simply resolve the installation order. The shell function
"build" becomes unnecessary and is therefore removed.
Diffstat:
4 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/build.sh b/build.sh
@@ -64,9 +64,3 @@ profile()
{
sed -e "s#@NAME@#$1#g" profile.mk.in
}
-
-# Register the submitted names as targets to install
-build()
-{
- printf "install_all: %s\n" "$@"
-}
diff --git a/git.mk.in b/git.mk.in
@@ -35,4 +35,5 @@ distclean_@NAME@:
clean_all: clean_@NAME@
distclean_all: distclean_@NAME@
+install_all: @NAME@
uninstall_all: uninstall_@NAME@
diff --git a/sgs.sh b/sgs.sh
@@ -22,7 +22,7 @@
[ -z "${BUILD_TYPE}" ] && BUILD_TYPE="RELEASE"
################################################################################
-# Declare git repositories for the build
+# Setup make directives for git repositories
################################################################################
name="rsys"
url="$\(REPO_VAPLV\)/rsys.git"
@@ -52,7 +52,7 @@ opt="BUILD_TYPE=${BUILD_TYPE}"
git_repo
################################################################################
-# Declare Star-PKG binaries for the build
+# Setup build directives for Star-PKG binaries
################################################################################
name="embree4"
url="$\(REPO_BIN\)/embree_4.0.1_gnu_linux64.tgz"
@@ -63,7 +63,6 @@ url="$\(REPO_BIN\)/Random123_1.14.0_gnu_linux64.tgz"
bin_spkg
################################################################################
-# Setup the build
+# Setup make directives for the profile file
################################################################################
-build star-3d star-mc
profile sgs.profile
diff --git a/spkg.mk.in b/spkg.mk.in
@@ -20,4 +20,5 @@ distclean_@NAME@:
rm -rf @ARCH@.tgz @ARCH@.sha512sum
distclean_all: distclean_@NAME@
+install_all: @NAME@
uninstall_all: uninstall_@NAME@