diff --git a/extras/ci/gitlab-ci.yml b/extras/ci/gitlab-ci.yml
index b7d03a6b912c5c2b095b944f76f7793694dc5ca6..9ddf3d6b7654033721b6914f6586bafc31d6bb3f 100644
--- a/extras/ci/gitlab-ci.yml
+++ b/extras/ci/gitlab-ci.yml
@@ -242,7 +242,7 @@ debian:
         if [ -n "$VLC_PREBUILT_CONTRIBS_URL" ]; then
             echo "Building using prebuilt contribs at $VLC_PREBUILT_CONTRIBS_URL"
             make prebuilt PREBUILT_URL="${VLC_PREBUILT_CONTRIBS_URL}"
-            make -j$NCPU --output-sync=recurse .protoc
+            make -j$NCPU --output-sync=recurse tools
         else
             make list
             make -j$NCPU --output-sync=recurse fetch
diff --git a/extras/package/macosx/build.sh b/extras/package/macosx/build.sh
index 2d0d90ad13b314c1315efe03d807f0ff391023c0..1f323600cb791f2ba42a83722449903c4711dfce 100755
--- a/extras/package/macosx/build.sh
+++ b/extras/package/macosx/build.sh
@@ -183,7 +183,7 @@ if [ ! -e "../$HOST_TRIPLET" ]; then
     else
         make prebuilt
     fi
-    make .luac .protoc
+    make -j$JOBS tools
 fi
 fi
 spopd
diff --git a/extras/package/raspberry/build.sh b/extras/package/raspberry/build.sh
index c93b16145d3732f7047d9b13a0c7d03af9e27f15..fdc0f68278beec01cc012bb1c3e122278c91e34a 100755
--- a/extras/package/raspberry/build.sh
+++ b/extras/package/raspberry/build.sh
@@ -130,10 +130,10 @@ if [ "$PREBUILT" != "yes" ]; then
     fi
 elif [ -n "$VLC_PREBUILT_CONTRIBS_URL" ]; then
     make prebuilt PREBUILT_URL="$VLC_PREBUILT_CONTRIBS_URL"
-    make -j$JOBS --output-sync=recurse .luac .protoc
+    make -j$JOBS --output-sync=recurse tools
 else
     make prebuilt
-    make -j$JOBS --output-sync=recurse .luac .protoc
+    make -j$JOBS --output-sync=recurse tools
 fi
 cd ../..
 
diff --git a/extras/package/snap/snapcraft.yaml b/extras/package/snap/snapcraft.yaml
index 6e6337e5820f51ff76cd6c05ed9db92b6c308bcc..4252e8f355db22ccd4111a99f9e6257f355687d1 100644
--- a/extras/package/snap/snapcraft.yaml
+++ b/extras/package/snap/snapcraft.yaml
@@ -82,7 +82,7 @@ parts:
           --disable-chromaprint
       if [ -v VLC_PREBUILT_CONTRIBS_URL ]; then
           make prebuilt PREBUILT_URL="$VLC_PREBUILT_CONTRIBS_URL"
-          make -j $(getconf _NPROCESSORS_ONLN) .protoc
+          make -j $(getconf _NPROCESSORS_ONLN) tools
       else
           make list
           make -j $(getconf _NPROCESSORS_ONLN) fetch
diff --git a/extras/package/win32/build.sh b/extras/package/win32/build.sh
index 802c91ca981275224e7ef1e13b7d320c5af87eb6..8c6155a51de56252fe15ec988cf0179eee017be7 100755
--- a/extras/package/win32/build.sh
+++ b/extras/package/win32/build.sh
@@ -333,7 +333,7 @@ else
     else
         make prebuilt
     fi
-    make .luac .protoc
+    make -j$JOBS tools
 fi
 cd ../..