[vlc-commits] [Git][videolan/vlc][master] modules: remove standalone AM_CFLAGS usage

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
56ab65e9 by Steve Lhomme at 2022-06-02T05:39:11+00:00
modules: remove standalone AM_CFLAGS usage

It's implied when the xxx_CFLAGS is not set.

- - - - -


7 changed files:

- modules/audio_output/Makefile.am
- modules/codec/Makefile.am
- modules/isa/arm/Makefile.am
- modules/logger/Makefile.am
- modules/stream_filter/Makefile.am
- modules/stream_out/Makefile.am
- modules/video_output/Makefile.am


Changes:

=====================================
modules/audio_output/Makefile.am
=====================================
@@ -5,7 +5,6 @@ libopensles_android_plugin_la_SOURCES = audio_output/opensles_android.c
 libopensles_android_plugin_la_LIBADD = libandroid_utils.la $(LIBDL) $(LIBM)
 
 libandroid_audiotrack_plugin_la_SOURCES = audio_output/audiotrack.c
-libandroid_audiotrack_plugin_la_CFLAGS = $(AM_CFLAGS)
 libandroid_audiotrack_plugin_la_LIBADD = libandroid_utils.la
 
 if HAVE_ANDROID


=====================================
modules/codec/Makefile.am
=====================================
@@ -575,7 +575,6 @@ codec_LTLIBRARIES += $(LTLIBtwolame)
 libdav1d_plugin_la_SOURCES = codec/dav1d.c \
 	packetizer/av1_obu.c packetizer/av1_obu.h
 libdav1d_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(DAV1D_CFLAGS)
-libdav1d_plugin_la_CFLAGS = $(AM_CFLAGS)
 libdav1d_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
 libdav1d_plugin_la_LIBADD = $(DAV1D_LIBS)
 EXTRA_LTLIBRARIES += libdav1d_plugin.la


=====================================
modules/isa/arm/Makefile.am
=====================================
@@ -16,14 +16,12 @@ libchroma_yuv_neon_plugin_la_SOURCES = \
 	isa/arm/neon/i422_yuyv.S \
 	isa/arm/neon/yuyv_i422.S \
 	isa/arm/neon/chroma_yuv.c isa/arm/neon/chroma_neon.h
-libchroma_yuv_neon_plugin_la_CFLAGS = $(AM_CFLAGS)
 libchroma_yuv_neon_plugin_LIBTOOLFLAGS = --tag=CC
 
 libdeinterlace_neon_plugin_la_SOURCES = \
 	isa/arm/neon/deinterlace.c isa/arm/neon/merge.S
 
 libvolume_neon_plugin_la_SOURCES = isa/arm/neon/volume.c isa/arm/neon/amplify.S
-libvolume_neon_plugin_la_CFLAGS = $(AM_CFLAGS)
 libvolume_neon_plugin_LIBTOOLFLAGS = --tag=CC
 
 libyuv_rgb_neon_plugin_la_SOURCES = \
@@ -32,7 +30,6 @@ libyuv_rgb_neon_plugin_la_SOURCES = \
 	isa/arm/neon/nv21_rgb.S \
 	isa/arm/neon/nv12_rgb.S \
 	isa/arm/neon/yuv_rgb.c
-libyuv_rgb_neon_plugin_la_CFLAGS = $(AM_CFLAGS)
 libyuv_rgb_neon_plugin_LIBTOOLFLAGS = --tag=CC
 
 if HAVE_NEON


=====================================
modules/logger/Makefile.am
=====================================
@@ -17,7 +17,6 @@ logger_LTLIBRARIES += libsd_journal_plugin.la
 endif
 
 libandroid_logger_plugin_la_SOURCES = logger/android.c
-libandroid_logger_plugin_la_CFLAGS = $(AM_CFLAGS)
 libandroid_logger_plugin_la_LIBADD = -llog
 if HAVE_ANDROID
 logger_LTLIBRARIES += libandroid_logger_plugin.la


=====================================
modules/stream_filter/Makefile.am
=====================================
@@ -26,10 +26,8 @@ if !HAVE_WINSTORE
 stream_filter_LTLIBRARIES += libprefetch_plugin.la
 endif
 
-libhds_plugin_la_SOURCES = \
-    stream_filter/hds/hds.c
+libhds_plugin_la_SOURCES = stream_filter/hds/hds.c
 
-libhds_plugin_la_CFLAGS = $(AM_CFLAGS)
 stream_filter_LTLIBRARIES += libhds_plugin.la
 
 librecord_plugin_la_SOURCES = stream_filter/record.c


=====================================
modules/stream_out/Makefile.am
=====================================
@@ -26,7 +26,6 @@ libstream_out_transcode_plugin_la_SOURCES = \
         stream_out/transcode/encoder/video.c \
 	stream_out/transcode/spu.c \
 	stream_out/transcode/audio.c stream_out/transcode/video.c
-libstream_out_transcode_plugin_la_CFLAGS = $(AM_CFLAGS)
 libstream_out_transcode_plugin_la_LIBADD = $(LIBM)
 libstream_out_udp_plugin_la_SOURCES = \
 	stream_out/sdp_helper.c stream_out/sdp_helper.h \


=====================================
modules/video_output/Makefile.am
=====================================
@@ -286,11 +286,9 @@ libegl_android_plugin_la_CFLAGS = $(AM_CFLAGS) $(EGL_CFLAGS) -DUSE_PLATFORM_ANDR
 libegl_android_plugin_la_LIBADD = $(EGL_LIBS) libandroid_utils.la
 
 libandroid_window_plugin_la_SOURCES = video_output/android/window.c
-libandroid_window_plugin_la_CFLAGS = $(AM_CFLAGS)
 libandroid_window_plugin_la_LIBADD = libandroid_utils.la $(LIBDL)
 
 libandroid_display_plugin_la_SOURCES = video_output/android/display.c
-libandroid_display_plugin_la_CFLAGS = $(AM_CFLAGS)
 libandroid_display_plugin_la_LIBADD = libandroid_utils.la $(LIBDL)
 
 libglinterop_android_plugin_la_SOURCES = video_output/opengl/interop_android.c \



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/56ab65e9ea5415ea8c1b4fd2685126d9b95107cf

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


VideoLAN code repository instance