[vlc-commits] [Git][videolan/vlc][master] 2 commits: macosx: avoid using SOURCES suffix for sources not build via regular rules

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
da38df3b by Steve Lhomme at 2025-10-16T11:57:16+00:00
macosx: avoid using SOURCES suffix for sources not build via regular rules

The suffix seems to be reserved.

> warning: variable 'libmacosx_plugin_la_METAL_SOURCES' is defined but no program or library has 'libmacosx_plugin_la_METAL' as canonical name (possible typo)

We are not building a program or "library".

Fixes #29415

- - - - -
c87cbb73 by Steve Lhomme at 2025-10-16T11:57:16+00:00
automake: use MKDIR_P instead of mkdir -p

- - - - -


4 changed files:

- modules/gui/macosx/Makefile.am
- modules/stream_out/Makefile.am
- share/Makefile.am
- src/Makefile.am


Changes:

=====================================
modules/gui/macosx/Makefile.am
=====================================
@@ -30,7 +30,7 @@ xib_verbose_0 = @echo "  XIB     " $@;
 xib_verbose__0 = $(xib_verbose_0)
 
 .xib.nib:
-	$(AM_V_at)mkdir -p -- gui/macosx/UI
+	$(AM_V_at)$(MKDIR_P) "gui/macosx/UI"
 	$(xib_verbose)$(XIB) --errors --warnings --notices \
 	  --module VLC --auto-activate-custom-fonts --target-device mac \
 	  --minimum-deployment-target 10.11 --output-format human-readable-text \
@@ -54,15 +54,15 @@ metallib_verbose_ = $(metallib_verbose__$(AM_DEFAULT_VERBOSITY))
 metallib_verbose_0 = @echo "  METALLIB " $@;
 metallib_verbose__0 = $(metallib_verbose_0)
 
-libmacosx_plugin_la_METAL_SOURCES = gui/macosx/shaders/VLCSnowShader.metal
-libmacosx_plugin_la_METAL_AIR_FILES = $(libmacosx_plugin_la_METAL_SOURCES:.metal=.air)
+libmacosx_plugin_la_METAL_srcs = gui/macosx/shaders/VLCSnowShader.metal
+libmacosx_plugin_la_METAL_AIR_FILES = $(libmacosx_plugin_la_METAL_srcs:.metal=.air)
 libmacosx_plugin_la_METAL_LIBRARY = gui/macosx/Resources/Shaders.metallib
 
 $(libmacosx_plugin_la_METAL_LIBRARY): $(libmacosx_plugin_la_METAL_AIR_FILES)
 	$(AM_V_at)$(MKDIR_P) "gui/macosx/shaders"
 	$(metallib_verbose)$(METALLIB) $(libmacosx_plugin_la_METAL_AIR_FILES) -o $@
 
-EXTRA_DIST += $(libmacosx_plugin_la_METAL_SOURCES)
+EXTRA_DIST += $(libmacosx_plugin_la_METAL_srcs)
 BUILT_SOURCES += $(libmacosx_plugin_la_METAL_LIBRARY)
 CLEANFILES += $(libmacosx_plugin_la_METAL_AIR_FILES) $(libmacosx_plugin_la_METAL_LIBRARY)
 


=====================================
modules/stream_out/Makefile.am
=====================================
@@ -126,7 +126,7 @@ sout_LTLIBRARIES += $(LTLIBstream_out_chromaprint)
 SUFFIXES += .proto .pb.cc
 
 stream_out/chromecast/@PROTOBUF_VERSION@/cast_channel.pb.cc: stream_out/chromecast/cast_channel.proto
-	$(AM_V_at)mkdir -p stream_out/chromecast/@PROTOBUF_VERSION@
+	$(AM_V_at)$(MKDIR_P) "stream_out/chromecast/@PROTOBUF_VERSION@"
 	$(AM_V_GEN)$(PROTOC) --cpp_out=stream_out/chromecast/@PROTOBUF_VERSION@ -I$(srcdir)/stream_out/chromecast $<
 
 stream_out/chromecast/@PROTOBUF_VERSION@/cast_channel.pb.h: stream_out/chromecast/@PROTOBUF_VERSION@/cast_channel.pb.cc
@@ -143,7 +143,7 @@ libstream_out_chromecast_plugin_la_SOURCES = stream_out/chromecast/cast.cpp stre
                                              stream_out/chromecast/chromecast_communication.cpp
 nodist_libstream_out_chromecast_plugin_la_SOURCES = stream_out/chromecast/@PROTOBUF_VERSION@/cast_channel.pb.cc
 libstream_out_chromecast_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -Istream_out/chromecast/@PROTOBUF_VERSION@ $(CHROMECAST_CFLAGS)
-libstream_out_chromecast_plugin_la_LIBADD = $(CHROMECAST_LIBS) $(SOCKET_LIBS) libvlc_json.la 
+libstream_out_chromecast_plugin_la_LIBADD = $(CHROMECAST_LIBS) $(SOCKET_LIBS) libvlc_json.la
 CLEANFILES += $(nodist_libstream_out_chromecast_plugin_la_SOURCES)
 
 if ENABLE_SOUT


=====================================
share/Makefile.am
=====================================
@@ -149,7 +149,7 @@ skins2_default_vlt_FILES = \
 	skins2/default/subX/vol_slider.png
 
 skins2/default.vlt: $(skins2_default_vlt_FILES)
-	$(AM_V_at)mkdir -p skins2
+	$(AM_V_at)$(MKDIR_P) "skins2"
 	$(AM_V_at)rm -f -- skins2/default.vlt.tmp
 	$(AM_V_GEN)GZIP=--no-name \
 	tar cvvzf skins2/default.vlt.tmp \
@@ -174,7 +174,7 @@ luac_verbose_0 = @echo "  LUAC   $@";
 	done; \
 	echo "Attempt to byte-compile unknown file: $(<)!"; \
 	exit 1
-	$(AM_V_at)mkdir -p "$$(dirname '$@')"
+	$(AM_V_at)$(MKDIR_P) "$$(dirname '$@')"
 	$(luac_verbose)$(LUAC) -o $@ $<
 
 if BUILD_LUA


=====================================
src/Makefile.am
=====================================
@@ -148,7 +148,7 @@ noinst_HEADERS = \
 
 ../include/vlc_about.h: Makefile.am $(top_srcdir)/COPYING $(top_srcdir)/THANKS $(top_srcdir)/AUTHORS
 	$(AM_V_at)rm -f -- "$@.tmp"
-	$(AM_V_at)mkdir -p -- ../include
+	$(AM_V_at)$(MKDIR_P) "../include"
 	$(AM_V_GEN)(echo "/* Automatically generated file - DO NOT EDIT */" && \
 	echo "static const char psz_license[] =" && \
 	sed 's/"/\\"/g;s/^.*$$/\"&\\n\"/' "$(top_srcdir)/COPYING" && \



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/3097b1873ddd96968ad8a341accc66340aa369ad...c87cbb73d9f2833df214049c93f06e9ffafe06d9

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/3097b1873ddd96968ad8a341accc66340aa369ad...c87cbb73d9f2833df214049c93f06e9ffafe06d9
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance