Welcome to little lamb

Code » comain » commit 9adc8fe

Cleanups & updates in deps.tpl

author Olivier Brunel
2023-12-24 14:18:14 UTC
committer Olivier Brunel
2024-01-09 18:16:31 UTC
parent 0ab8eff58d558df88616de2fbe3ae99034e169c3

Cleanups & updates in deps.tpl

meta/deps.tpl/limb/incdir +0 -1
meta/deps.tpl/limb/version +1 -1
meta/deps.tpl/skalibs/get_incdir +0 -5
meta/deps.tpl/skalibs/get_vpath +0 -8
meta/deps.tpl/skalibs/is_found +32 -3

diff --git a/meta/deps.tpl/limb/incdir b/meta/deps.tpl/limb/incdir
deleted file mode 100644
index 30b990f..0000000
--- a/meta/deps.tpl/limb/incdir
+++ /dev/null
@@ -1 +0,0 @@
-src/liblimb/include
diff --git a/meta/deps.tpl/limb/version b/meta/deps.tpl/limb/version
index 8acdd82..0ea3a94 100644
--- a/meta/deps.tpl/limb/version
+++ b/meta/deps.tpl/limb/version
@@ -1 +1 @@
-0.0.1
+0.2.0
diff --git a/meta/deps.tpl/skalibs/get_incdir b/meta/deps.tpl/skalibs/get_incdir
deleted file mode 100755
index 70d97d5..0000000
--- a/meta/deps.tpl/skalibs/get_incdir
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-isint=$1
-if test $isint -eq 1; then
-    echo src/include
-fi
diff --git a/meta/deps.tpl/skalibs/get_vpath b/meta/deps.tpl/skalibs/get_vpath
deleted file mode 100755
index da80629..0000000
--- a/meta/deps.tpl/skalibs/get_vpath
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-type=$1
-libdir=$2
-if test "$type" = "shared"; then
-    echo $libdir
-else
-    echo $libdir/skalibs
-fi
diff --git a/meta/deps.tpl/skalibs/is_found b/meta/deps.tpl/skalibs/is_found
index c2181e0..1769b3a 100755
--- a/meta/deps.tpl/skalibs/is_found
+++ b/meta/deps.tpl/skalibs/is_found
@@ -1,4 +1,33 @@
 #!/bin/sh
-libdir=$1
-test -e "$libdir/libskarnet.a" || test -e "$libdir/skalibs/libskarnet.a" \
-    || test -e "$libdir/libskarnet.so"
+isint=$1
+type=$2
+dir=$3
+in=
+
+case "$type" in
+    shared)
+        file=libskarnet.so
+        ;;
+    static)
+        file=libskarnet.a
+        ;;
+    include)
+        test $isint -eq 1 && in=src/include
+        file=skalibs/skalibs.h
+        ;;
+    *)
+        exit 1
+        ;;
+esac
+
+if test -e "$dir/$in/$file"; then
+    echo $in
+    exit 0
+fi
+
+if test "$type" = "static" && test -e "$dir/skalibs/$file"; then
+    echo skalibs
+    exit 0
+fi
+
+exit 1