Skip to content
Snippets Groups Projects
Commit 0b9f3f83 authored by Alexandre Janniaux's avatar Alexandre Janniaux Committed by Steve Lhomme
Browse files

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.
parent 03a56c84
No related branches found
No related tags found
1 merge request!6496Makefile.am: fix installation regression
Pipeline #543547 passed with stages
in 33 minutes and 30 seconds
...@@ -2,7 +2,8 @@ aoutdir = $(pluginsdir)/audio_output ...@@ -2,7 +2,8 @@ aoutdir = $(pluginsdir)/audio_output
aout_LTLIBRARIES = aout_LTLIBRARIES =
# Install the pkglib/pkglibexec first before relinking the modules. # Install the pkglib/pkglibexec first before relinking the modules.
# This ensures libtool re-linking is not racy. # This ensures libtool re-linking is not racy.
install-aoutLTLIBRARIES: install-pkglibLTLIBRARIES installaoutLTLIBRARIES = install-aoutLTLIBRARIES
$(installaoutLTLIBRARIES): install-pkglibLTLIBRARIES
libvlc_android_audioformat_jni_la_SOURCES = \ libvlc_android_audioformat_jni_la_SOURCES = \
audio_output/android/audioformat_jni.c \ audio_output/android/audioformat_jni.c \
......
vdpaudir = $(pluginsdir)/vdpau vdpaudir = $(pluginsdir)/vdpau
# Install the pkglib/pkglibexec first before relinking the modules. # Install the pkglib/pkglibexec first before relinking the modules.
# This ensures libtool re-linking is not racy. # 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 libvlc_vdpau_la_SOURCES = hw/vdpau/vlc_vdpau.c hw/vdpau/vlc_vdpau.h
......
...@@ -2,7 +2,8 @@ voutdir = $(pluginsdir)/video_output ...@@ -2,7 +2,8 @@ voutdir = $(pluginsdir)/video_output
vout_LTLIBRARIES = vout_LTLIBRARIES =
# Install the pkglib/pkglibexec first before relinking the modules. # Install the pkglib/pkglibexec first before relinking the modules.
# This ensures libtool re-linking is not racy. # This ensures libtool re-linking is not racy.
install-voutLTLIBRARIES: install-pkglibLTLIBRARIES installvoutLTLIBRARIES = install-voutLTLIBRARIES
$(installvoutLTLIBRARIES): install-pkglibLTLIBRARIES
EXTRA_DIST += video_output/README EXTRA_DIST += video_output/README
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment