[vlc-commits] [Git][videolan/vlc][master] Makefile.am: fix installation regression

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
0b9f3f83 by Alexandre Janniaux at 2024-12-10T06:26:08+00:00
Makefile.am: fix installation regression

Automake doesn't generate automatic rules when a rule already exist in
the file, except if it cannot detect it. Adding the
`install-fooLTLIBRARIES: install-pkglibLTLIBRARIES` rule for audio
outputs, video outputs and vdpau broke the installation.

Adding `$(install-fooLTLIBRARIES): install-pkglibLTLIBRARIES` also makes
automake unhappy because of the variable name looking suspiciously close
to the target it generates, so a version without the dash is used for
the variable name in the rule. With this, the install target is
preserved but the dependency also exists in the output.

- - - - -


3 changed files:

- modules/audio_output/Makefile.am
- modules/hw/vdpau/Makefile.am
- modules/video_output/Makefile.am


Changes:

=====================================
modules/audio_output/Makefile.am
=====================================
@@ -2,7 +2,8 @@ aoutdir = $(pluginsdir)/audio_output
 aout_LTLIBRARIES =
 # Install the pkglib/pkglibexec first before relinking the modules.
 # This ensures libtool re-linking is not racy.
-install-aoutLTLIBRARIES: install-pkglibLTLIBRARIES
+installaoutLTLIBRARIES = install-aoutLTLIBRARIES
+$(installaoutLTLIBRARIES): install-pkglibLTLIBRARIES
 
 libvlc_android_audioformat_jni_la_SOURCES = \
 	audio_output/android/audioformat_jni.c \


=====================================
modules/hw/vdpau/Makefile.am
=====================================
@@ -1,7 +1,8 @@
 vdpaudir = $(pluginsdir)/vdpau
 # Install the pkglib/pkglibexec first before relinking the modules.
 # This ensures libtool re-linking is not racy.
-install-vpdauLTLIBRARIES: install-pkglibLTLIBRARIES
+installvpdauLTLIBRARIES = install-vdpauLTLIBRARIES
+$(installvpdauLTLIBRARIES): install-pkglibLTLIBRARIES
 
 
 libvlc_vdpau_la_SOURCES = hw/vdpau/vlc_vdpau.c hw/vdpau/vlc_vdpau.h


=====================================
modules/video_output/Makefile.am
=====================================
@@ -2,7 +2,8 @@ voutdir = $(pluginsdir)/video_output
 vout_LTLIBRARIES =
 # Install the pkglib/pkglibexec first before relinking the modules.
 # This ensures libtool re-linking is not racy.
-install-voutLTLIBRARIES: install-pkglibLTLIBRARIES
+installvoutLTLIBRARIES = install-voutLTLIBRARIES
+$(installvoutLTLIBRARIES): install-pkglibLTLIBRARIES
 
 EXTRA_DIST += video_output/README
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/0b9f3f836f1c678e6d101f62545a8edaba16dcd0

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/0b9f3f836f1c678e6d101f62545a8edaba16dcd0
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance