[vlc-commits] src: deduplicate Linux sources selection
Rémi Denis-Courmont
git at videolan.org
Sun Feb 16 15:31:58 CET 2020
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Feb 16 16:02:04 2020 +0200| [deca29172e835d0b836fd3a1c721d97d5c024f46] | committer: Rémi Denis-Courmont
src: deduplicate Linux sources selection
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=deca29172e835d0b836fd3a1c721d97d5c024f46
---
src/Makefile.am | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 668bd6e198..98ac71d847 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -437,16 +437,6 @@ libvlccore_la_SOURCES += \
posix/timer.c
endif
-if HAVE_ANDROID
-libvlccore_la_SOURCES += \
- android/error.c \
- android/specific.c \
- android/thread.c \
- linux/cpu.c \
- linux/dirs.c \
- linux/thread.c
-endif
-
if HAVE_DARWIN
libvlccore_la_SOURCES += \
darwin/error.c \
@@ -458,13 +448,19 @@ libvlccore_objc_la_SOURCES = \
noinst_LTLIBRARIES = libvlccore_objc.la
endif
-if !HAVE_ANDROID
if HAVE_LINUX
libvlccore_la_SOURCES += \
linux/cpu.c \
linux/dirs.c \
- linux/filesystem.c \
linux/thread.c
+if !HAVE_ANDROID
+libvlccore_la_SOURCES += \
+ linux/filesystem.c
+else
+libvlccore_la_SOURCES += \
+ android/error.c \
+ android/specific.c \
+ android/thread.c
endif
endif
More information about the vlc-commits
mailing list