[vlc-commits] src: reduce nesting levels of OS-specific sources

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Feb 16 15:14:03 2020 +0200| [01a41f60af21e5b2608228ef3dbb8ffa1699a71c] | committer: Rémi Denis-Courmont

src: reduce nesting levels of OS-specific sources

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=01a41f60af21e5b2608228ef3dbb8ffa1699a71c
---

 src/Makefile.am | 51 ++++++++++++++++++++++++++++++---------------------
 1 file changed, 30 insertions(+), 21 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index b6c5996837..668bd6e198 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -411,7 +411,8 @@ libvlccore_la_SOURCES += posix/timer.c
 else
 libvlccore_la_SOURCES += win32/timer.c
 endif
-else
+endif
+
 if HAVE_OS2
 libvlccore_la_SOURCES += \
 	os2/dirs.c \
@@ -423,7 +424,8 @@ libvlccore_la_SOURCES += \
 	os2/specific.c \
 	os2/rand.c \
 	os2/thread.c
-else
+endif
+
 if HAVE_NACL
 libvlccore_la_SOURCES += \
 	android/error.c \
@@ -433,12 +435,8 @@ libvlccore_la_SOURCES += \
 	posix/rand.c \
 	posix/specific.c \
 	posix/timer.c
-else
-libvlccore_la_SOURCES += \
-	posix/filesystem.c \
-	posix/plugin.c \
-	posix/rand.c \
-	posix/timer.c
+endif
+
 if HAVE_ANDROID
 libvlccore_la_SOURCES += \
 	android/error.c \
@@ -447,29 +445,20 @@ libvlccore_la_SOURCES += \
 	linux/cpu.c \
 	linux/dirs.c \
 	linux/thread.c
-else
-
-# All except OS2/WIN32/NACL/ANDROID
-libvlccore_la_SOURCES += posix/sort.c
+endif
 
 if HAVE_DARWIN
 libvlccore_la_SOURCES += \
 	darwin/error.c \
 	darwin/specific.c \
 	darwin/thread.c
-
 libvlccore_objc_la_SOURCES = \
 	darwin/dirs.m \
 	darwin/netconf.m
 noinst_LTLIBRARIES = libvlccore_objc.la
-else
-libvlccore_la_SOURCES += \
-	posix/dirs.c \
-	posix/error.c \
-	posix/netconf.c \
-	posix/picture.c \
-	posix/specific.c \
-	posix/thread.c
+endif
+
+if !HAVE_ANDROID
 if HAVE_LINUX
 libvlccore_la_SOURCES += \
 	linux/cpu.c \
@@ -477,6 +466,26 @@ libvlccore_la_SOURCES += \
 	linux/filesystem.c \
 	linux/thread.c
 endif
+endif
+
+if !HAVE_WIN32
+if !HAVE_OS2
+if !HAVE_NACL
+libvlccore_la_SOURCES += \
+	posix/filesystem.c \
+	posix/plugin.c \
+	posix/rand.c \
+	posix/timer.c
+if !HAVE_ANDROID
+libvlccore_la_SOURCES += posix/sort.c
+if !HAVE_DARWIN
+libvlccore_la_SOURCES += \
+	posix/dirs.c \
+	posix/error.c \
+	posix/netconf.c \
+	posix/picture.c \
+	posix/specific.c \
+	posix/thread.c
 if HAVE_LIBANL
 libvlccore_la_SOURCES += \
 	linux/getaddrinfo.c