From b607a7fed7934c507efa6d1ca08daee773214dac Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Tue, 29 Jan 2013 16:47:47 +0100 Subject: [PATCH] linux: move files out of src/unix/linux Flattens the source tree and simplifies the Makefile. --- checksparse.sh | 8 ++++---- config-unix.mk | 14 +++++++++++--- src/unix/internal.h | 2 +- src/unix/{linux => }/linux-core.c | 2 +- src/unix/{linux/inotify.c => linux-inotify.c} | 3 +-- src/unix/{linux/syscalls.c => linux-syscalls.c} | 2 +- src/unix/{linux/syscalls.h => linux-syscalls.h} | 0 uv.gyp | 8 ++++---- 8 files changed, 23 insertions(+), 16 deletions(-) rename src/unix/{linux => }/linux-core.c (99%) rename src/unix/{linux/inotify.c => linux-inotify.c} (99%) rename src/unix/{linux/syscalls.c => linux-syscalls.c} (99%) rename src/unix/{linux/syscalls.h => linux-syscalls.h} (100%) diff --git a/checksparse.sh b/checksparse.sh index 3a19d161b..f06b27d28 100755 --- a/checksparse.sh +++ b/checksparse.sh @@ -195,10 +195,10 @@ Linux) SPARSE_FLAGS="$SPARSE_FLAGS -D__linux__=1" SOURCES="$SOURCES include/uv-private/uv-linux.h - src/unix/linux/inotify.c - src/unix/linux/linux-core.c - src/unix/linux/syscalls.c - src/unix/linux/syscalls.h" + src/unix/linux-inotify.c + src/unix/linux-core.c + src/unix/linux-syscalls.c + src/unix/linux-syscalls.h" ;; NetBSD) SPARSE_FLAGS="$SPARSE_FLAGS -D__NetBSD__=1" diff --git a/config-unix.mk b/config-unix.mk index fe78c2d09..e9d966810 100644 --- a/config-unix.mk +++ b/config-unix.mk @@ -81,9 +81,9 @@ ifeq (linux,$(OS)) CSTDFLAG += -D_GNU_SOURCE LDFLAGS+=-ldl -lrt RUNNER_CFLAGS += -D_GNU_SOURCE -OBJS += src/unix/linux/linux-core.o \ - src/unix/linux/inotify.o \ - src/unix/linux/syscalls.o +OBJS += src/unix/linux-core.o \ + src/unix/linux-inotify.o \ + src/unix/linux-syscalls.o endif ifeq (freebsd,$(OS)) @@ -130,6 +130,14 @@ libuv.$(SOEXT): override CFLAGS += -fPIC libuv.$(SOEXT): $(OBJS) $(CC) -shared -o $@ $^ $(LDFLAGS) +include/uv-private/uv-unix.h: \ + include/uv-private/uv-bsd.h \ + include/uv-private/uv-darwin.h \ + include/uv-private/uv-linux.h \ + include/uv-private/uv-sunos.h + +src/unix/internal.h: src/unix/linux-syscalls.h + src/unix/%.o: src/unix/%.c include/uv.h include/uv-private/uv-unix.h src/unix/internal.h @mkdir -p $(dir $@) $(CC) $(CSTDFLAG) $(CPPFLAGS) $(CFLAGS) -c $< -o $@ diff --git a/src/unix/internal.h b/src/unix/internal.h index 2c61f910e..d6d2e45fd 100644 --- a/src/unix/internal.h +++ b/src/unix/internal.h @@ -32,7 +32,7 @@ #endif #if defined(__linux__) -# include "linux/syscalls.h" +# include "linux-syscalls.h" #endif /* __linux__ */ #if defined(__sun) diff --git a/src/unix/linux/linux-core.c b/src/unix/linux-core.c similarity index 99% rename from src/unix/linux/linux-core.c rename to src/unix/linux-core.c index b591314ff..8e6002ebe 100644 --- a/src/unix/linux/linux-core.c +++ b/src/unix/linux-core.c @@ -19,7 +19,7 @@ */ #include "uv.h" -#include "../internal.h" +#include "internal.h" #include #include diff --git a/src/unix/linux/inotify.c b/src/unix/linux-inotify.c similarity index 99% rename from src/unix/linux/inotify.c rename to src/unix/linux-inotify.c index 2edf221c1..108345aa8 100644 --- a/src/unix/linux/inotify.c +++ b/src/unix/linux-inotify.c @@ -20,8 +20,7 @@ #include "uv.h" #include "tree.h" -#include "../internal.h" -#include "syscalls.h" +#include "internal.h" #include #include diff --git a/src/unix/linux/syscalls.c b/src/unix/linux-syscalls.c similarity index 99% rename from src/unix/linux/syscalls.c rename to src/unix/linux-syscalls.c index 870763be2..06cc5943c 100644 --- a/src/unix/linux/syscalls.c +++ b/src/unix/linux-syscalls.c @@ -19,7 +19,7 @@ * IN THE SOFTWARE. */ -#include "syscalls.h" +#include "linux-syscalls.h" #include #include #include diff --git a/src/unix/linux/syscalls.h b/src/unix/linux-syscalls.h similarity index 100% rename from src/unix/linux/syscalls.h rename to src/unix/linux-syscalls.h diff --git a/uv.gyp b/uv.gyp index 6ec5aa289..301b93857 100644 --- a/uv.gyp +++ b/uv.gyp @@ -170,10 +170,10 @@ }], [ 'OS=="linux"', { 'sources': [ - 'src/unix/linux/linux-core.c', - 'src/unix/linux/inotify.c', - 'src/unix/linux/syscalls.c', - 'src/unix/linux/syscalls.h', + 'src/unix/linux-core.c', + 'src/unix/linux-inotify.c', + 'src/unix/linux-syscalls.c', + 'src/unix/linux-syscalls.h', ], 'link_settings': { 'libraries': [ '-ldl', '-lrt' ],