contrib: call meson install instead of ninja

Just like we have CMAKEBUILD we can use meson to call build and use whatever it picks for the build system.
videolan · Sep 15, 2022 · ddbfe0b · ddbfe0b
1 parent aa8b38b
commit ddbfe0b
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 10 deletions.
diff --git a/contrib/src/basu/rules.mak b/contrib/src/basu/rules.mak
@@ -26,5 +26,5 @@ basu: basu-$(BASU_VERSION).tar.gz .sum-basu
 .basu: basu crossfile.meson
 	rm -rf $</build
 	$(HOSTVARS_MESON) $(MESON) $</build $<
-	cd $< && cd build && ninja install
+	meson install -C $</build
 	touch $@
diff --git a/contrib/src/dav1d/rules.mak b/contrib/src/dav1d/rules.mak
@@ -28,5 +28,5 @@ dav1d: dav1d-$(DAV1D_VERSION).tar.xz .sum-dav1d
 .dav1d: dav1d crossfile.meson
 	rm -rf $</build
 	$(HOSTVARS_MESON) $(MESON) $(DAV1D_CONF) $</build $<
-	cd $< && cd build && ninja install
+	meson install -C $</build
 	touch $@
diff --git a/contrib/src/fribidi/rules.mak b/contrib/src/fribidi/rules.mak
@@ -20,5 +20,5 @@ fribidi: fribidi-$(FRIBIDI_VERSION).tar.xz .sum-fribidi
 .fribidi: fribidi crossfile.meson
 	rm -rf $</build
 	$(HOSTVARS_MESON) $(MESON) -Ddocs=false -Dbin=false -Dtests=false $</build $<
-	cd $< && cd build && ninja install
+	meson install -C $</build
 	touch $@
diff --git a/contrib/src/harfbuzz/rules.mak b/contrib/src/harfbuzz/rules.mak
@@ -32,5 +32,5 @@ endif
 .harfbuzz: harfbuzz crossfile.meson
 	rm -rf $</build
 	$(HOSTVARS_MESON) $(MESON) $(HARFBUZZ_CONF) $</build $<
-	cd $< && cd build && ninja install
+	meson install -C $</build
 	touch $@
diff --git a/contrib/src/libdsm/rules.mak b/contrib/src/libdsm/rules.mak
@@ -29,5 +29,5 @@ endif
 .libdsm: libdsm crossfile.meson
 	rm -rf $</build
 	$(HOSTVARS_MESON) $(MESON) -Dauto_features=disabled -Dbinaries=false $</build $<
-	cd $< && cd build && ninja install
+	meson install -C $</build
 	touch $@
diff --git a/contrib/src/libplacebo/rules.mak b/contrib/src/libplacebo/rules.mak
@@ -47,7 +47,7 @@ endif
 .libplacebo: libplacebo crossfile.meson
 	rm -rf $</build
 	$(HOSTVARS_MESON) $(MESON) $(PLACEBOCONF) $</build $<
-	cd $< && cd build && ninja install
+	meson install -C $</build
 # Work-around for full paths to static libraries, which libtool does not like
 # See https://github.com/mesonbuild/meson/issues/5479
 	(cd $(UNPACK_DIR) && $(SRC_BUILT)/pkg-rewrite-absolute.py -i "$(PREFIX)/lib/pkgconfig/libplacebo.pc")

diff --git a/contrib/src/librist/rules.mak b/contrib/src/librist/rules.mak
@@ -35,5 +35,5 @@ librist: librist-$(LIBRIST_VERSION).tar.gz .sum-librist
 .librist: librist crossfile.meson
 	rm -rf $</build
 	$(HOSTVARS_MESON) $(MESON) $(LIBRIST_CONF) $</build $<
-	cd $< && cd build && ninja install
+	meson install -C $</build
 	touch $@
diff --git a/contrib/src/medialibrary/rules.mak b/contrib/src/medialibrary/rules.mak
@@ -20,7 +20,6 @@ medialibrary: medialibrary-$(MEDIALIBRARY_VERSION).tar.bz2 .sum-medialibrary
 .medialibrary: medialibrary crossfile.meson
 	rm -rf $</build
 	$(HOSTVARS_MESON) $(MESON) -Dlibvlc=disabled -Dlibtool_workaround=true $</build $<
-	ninja -C $</build
-	cd $< && cd build && ninja install
+	meson install -C $</build
 	touch $@
 
diff --git a/contrib/src/microdns/rules.mak b/contrib/src/microdns/rules.mak
@@ -24,5 +24,5 @@ microdns: microdns-$(LIBMICRODNS_VERSION).tar.xz .sum-microdns
 .microdns: microdns crossfile.meson
 	rm -rf $</build
 	$(HOSTVARS_MESON) $(MESON) -Dauto_features=disabled $</build $<
-	cd $< && cd build && ninja install
+	meson install -C $</build
 	touch $@