[vlc-commits] linux: move specific files to dedicated directory

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed May 25 21:42:10 2016 +0300| [42891a742b2a9681bd11d20e1c0fb225af06b04a] | committer: Rémi Denis-Courmont

linux: move specific files to dedicated directory

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

 src/Makefile.am                              |    8 ++++----
 src/{posix/linux_cpu.c => linux/cpu.c}       |    2 +-
 src/{posix/linux_specific.c => linux/dirs.c} |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 2d34d34..fe4e16a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -260,6 +260,8 @@ SOURCES_libvlc_darwin = \
 	$(NULL)
 
 SOURCES_libvlc_android = \
+	linux/cpu.c \
+	linux/dirs.c \
 	android/dirs.c \
 	android/thread.c \
 	android/error.c \
@@ -267,13 +269,13 @@ SOURCES_libvlc_android = \
 	android/netconf.c \
 	posix/plugin.c \
 	posix/timer.c \
-	posix/linux_cpu.c \
-	posix/linux_specific.c \
 	android/specific.c \
 	posix/rand.c \
 	$(NULL)
 
 SOURCES_libvlc_linux = \
+	linux/cpu.c \
+	linux/dirs.c \
 	posix/dirs.c \
 	posix/error.c \
 	posix/filesystem.c \
@@ -281,8 +283,6 @@ SOURCES_libvlc_linux = \
 	posix/plugin.c \
 	posix/thread.c \
 	posix/timer.c \
-	posix/linux_cpu.c \
-	posix/linux_specific.c \
 	posix/specific.c \
 	posix/rand.c \
 	$(NULL)
diff --git a/src/posix/linux_cpu.c b/src/linux/cpu.c
similarity index 98%
rename from src/posix/linux_cpu.c
rename to src/linux/cpu.c
index 3ec7c3c..38fcce9 100644
--- a/src/posix/linux_cpu.c
+++ b/src/linux/cpu.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * linux_cpu.c: CPU detection code for Linux
+ * linux/cpu.c: CPU detection code for Linux
  *****************************************************************************
  * Copyright (C) 2012 Rémi Denis-Courmont
  *
diff --git a/src/posix/linux_specific.c b/src/linux/dirs.c
similarity index 98%
rename from src/posix/linux_specific.c
rename to src/linux/dirs.c
index ef2426d..59af705 100644
--- a/src/posix/linux_specific.c
+++ b/src/linux/dirs.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * linux_specific.c: Linux-specific initialization
+ * linux/dirs.c: Linux-specific directories
  *****************************************************************************
  * Copyright © 2008-2012 Rémi Denis-Courmont
  *