linux-qubasis

commit d40d51aa4498da82b960750f5d554b8778451764
parent 088d674f7f61d6e7cc199151e3b30e0a9c7479ad
Author: Jul <jul@9o.is>
Date:   Fri,  7 Nov 2025 00:49:50 -0500

clean up freetype headers with --prefix

Diffstat:
M
ninja/functions.sh
 | 
31
++++++++++++++++++++-----------
M
pkg/freetype/gen.sh
 | 
82
++++++++++++++++++++++++++++++++++++++-----------------------------------------

2 files changed, 59 insertions(+), 54 deletions(-)
diff --git a/ninja/functions.sh b/ninja/functions.sh
@@ -157,23 +157,32 @@ dep() {
 }
 
 include() {
-    _hdr_prefix=
-
-    case "$1" in
-        --prefix)
-            shift
-            _hdr_prefix=$1
-            shift
-            ;;
-    esac
+    __prefix=
+    __src_prefix=$srcdir
+
+    while [ $# -gt 0 ]; do
+        case "$1" in
+            --prefix)
+                __prefix=$2/
+                shift 2
+                ;;
+            --src-prefix)
+                __src_prefix=$srcdir/$2
+                shift 2
+                ;;
+            *)
+                break
+                ;;
+        esac
+    done
 
-    _ninja_prefix _srcs $srcdir $*
+    _ninja_prefix _srcs $__src_prefix $*
     _ninja_sync $_srcs
 
     for _src in $_srcs; do
         case $_src in
             \$srcdir/*)
-                _out=$outdir/include/${_hdr_prefix}${_src##*/}
+                _out=$outdir/include/${__prefix}${_src##*/}
                 build copy $_out $_src
                 ;;
             *)
diff --git a/pkg/freetype/gen.sh b/pkg/freetype/gen.sh
@@ -15,50 +15,46 @@ cflags "
 
 dep zlib/headers
 
-hdrs() {
-    for v in $*; do
-        build copy $outdir/include/$v $srcdir/include/$v
-        sync $srcdir/$v
-        include $outdir/include/$v
-    done
-}
+include include/ft2build.h
 
-hdrs "
-    ft2build.h
-    freetype/freetype.h
-    freetype/ftadvanc.h
-    freetype/ftbdf.h
-    freetype/ftbitmap.h
-    freetype/ftcache.h
-    freetype/ftcolor.h
-    freetype/fterrdef.h
-    freetype/fterrors.h
-    freetype/ftfntfmt.h
-    freetype/ftglyph.h
-    freetype/ftimage.h
-    freetype/ftmm.h
-    freetype/ftmodapi.h
-    freetype/ftmoderr.h
-    freetype/ftoutln.h
-    freetype/ftparams.h
-    freetype/ftsizes.h
-    freetype/ftsnames.h
-    freetype/ftstroke.h
-    freetype/ftsynth.h
-    freetype/ftsystem.h
-    freetype/fttrigon.h
-    freetype/fttypes.h
-    freetype/t1tables.h
-    freetype/ttnameid.h
-    freetype/tttables.h
-    freetype/tttags.h
-    freetype/config/ftconfig.h
-    freetype/config/ftheader.h
-    freetype/config/ftoption.h
-    freetype/config/ftstdlib.h
-    freetype/config/integer-types.h
-    freetype/config/mac-support.h
-    freetype/config/public-macros.h
+include --prefix freetype --src-prefix include/freetype "
+    freetype.h
+    ftadvanc.h
+    ftbdf.h
+    ftbitmap.h
+    ftcache.h
+    ftcolor.h
+    fterrdef.h
+    fterrors.h
+    ftfntfmt.h
+    ftglyph.h
+    ftimage.h
+    ftmm.h
+    ftmodapi.h
+    ftmoderr.h
+    ftoutln.h
+    ftparams.h
+    ftsizes.h
+    ftsnames.h
+    ftstroke.h
+    ftsynth.h
+    ftsystem.h
+    fttrigon.h
+    fttypes.h
+    t1tables.h
+    ttnameid.h
+    tttables.h
+    tttags.h
+"
+
+include --prefix freetype/config --src-prefix include/freetype/config "
+    ftconfig.h
+    ftheader.h
+    ftoption.h
+    ftstdlib.h
+    integer-types.h
+    mac-support.h
+    public-macros.h
 "
 
 lib libfreetype.a "