move eio stuff into src/unix

joyent · Aug 31, 2011 · 231298a · 231298a
1 parent e3f910d
commit 231298a
Show file tree

Hide file tree

Showing 23 changed files with 21 additions and 19 deletions.
diff --git a/config-unix.mk b/config-unix.mk
@@ -85,9 +85,9 @@ endif
 RUNNER_LIBS=
 RUNNER_SRC=test/runner-unix.c
 
-uv.a: src/uv-unix.o src/unix/fs.o src/uv-common.o src/uv-platform.o src/ev/ev.o src/uv-eio.o src/eio/eio.o $(CARES_OBJS)
-	$(AR) rcs uv.a src/uv-unix.o src/unix/fs.o src/uv-platform.o src/uv-common.o src/uv-eio.o src/ev/ev.o \
-		src/eio/eio.o $(CARES_OBJS)
+uv.a: src/uv-unix.o src/unix/fs.o src/uv-common.o src/uv-platform.o src/ev/ev.o src/unix/uv-eio.o src/unix/eio/eio.o $(CARES_OBJS)
+	$(AR) rcs uv.a src/uv-unix.o src/unix/fs.o src/uv-platform.o src/uv-common.o src/unix/uv-eio.o src/ev/ev.o \
+		src/unix/eio/eio.o $(CARES_OBJS)
 
 src/uv-platform.o: src/$(UV_OS_FILE) include/uv.h include/uv-unix.h
 	$(CC) $(CSTDFLAG) $(CPPFLAGS) $(CFLAGS) -c src/$(UV_OS_FILE) -o src/uv-platform.o
@@ -110,21 +110,23 @@ EIO_CPPFLAGS += -DEIO_CONFIG_H=\"$(EIO_CONFIG)\"
 EIO_CPPFLAGS += -DEIO_STACKSIZE=262144
 EIO_CPPFLAGS += -D_GNU_SOURCE
 
-src/eio/eio.o: src/eio/eio.c
-	$(CC) $(EIO_CPPFLAGS) $(CFLAGS) -c src/eio/eio.c -o src/eio/eio.o
+src/unix/eio/eio.o: src/unix/eio/eio.c
+	$(CC) $(EIO_CPPFLAGS) $(CFLAGS) -c src/unix/eio/eio.c -o src/unix/eio/eio.o
 
-src/uv-eio.o: src/uv-eio.c
-	$(CC) $(CPPFLAGS) -Isrc/eio/ $(CSTDFLAG) $(CFLAGS) -c src/uv-eio.c -o src/uv-eio.o
+src/unix/uv-eio.o: src/unix/uv-eio.c
+	$(CC) $(CPPFLAGS) -Isrc/unix/eio/ $(CSTDFLAG) $(CFLAGS) -c src/unix/uv-eio.c -o src/unix/uv-eio.o
 
 
 clean-platform:
 	-rm -f src/ares/*.o
 	-rm -f src/ev/*.o
-	-rm -f src/eio/*.o
+	-rm -f src/unix/eio/*.o
+	-rm -f src/unix/*.o
 	-rm -rf test/run-tests.dSYM run-benchmarks.dSYM
 
 distclean-platform:
 	-rm -f src/ares/*.o
 	-rm -f src/ev/*.o
-	-rm -f src/eio/*.o
+	-rm -f src/unix/*.o
+	-rm -f src/unix/eio/*.o
 	-rm -rf test/run-tests.dSYM run-benchmarks.dSYM
diff --git a/src/eio/Changes → src/unix/eio/Changes b/src/eio/Changes → src/unix/eio/Changes
diff --git a/src/eio/LICENSE → src/unix/eio/LICENSE b/src/eio/LICENSE → src/unix/eio/LICENSE
diff --git a/src/eio/Makefile.am → src/unix/eio/Makefile.am b/src/eio/Makefile.am → src/unix/eio/Makefile.am
diff --git a/src/eio/aclocal.m4 → src/unix/eio/aclocal.m4 b/src/eio/aclocal.m4 → src/unix/eio/aclocal.m4
diff --git a/src/eio/autogen.sh → src/unix/eio/autogen.sh b/src/eio/autogen.sh → src/unix/eio/autogen.sh
diff --git a/src/eio/config.h.in → src/unix/eio/config.h.in b/src/eio/config.h.in → src/unix/eio/config.h.in
diff --git a/src/eio/config_cygwin.h → src/unix/eio/config_cygwin.h b/src/eio/config_cygwin.h → src/unix/eio/config_cygwin.h
diff --git a/src/eio/config_darwin.h → src/unix/eio/config_darwin.h b/src/eio/config_darwin.h → src/unix/eio/config_darwin.h
diff --git a/src/eio/config_freebsd.h → src/unix/eio/config_freebsd.h b/src/eio/config_freebsd.h → src/unix/eio/config_freebsd.h
diff --git a/src/eio/config_linux.h → src/unix/eio/config_linux.h b/src/eio/config_linux.h → src/unix/eio/config_linux.h
diff --git a/src/eio/config_sunos.h → src/unix/eio/config_sunos.h b/src/eio/config_sunos.h → src/unix/eio/config_sunos.h
diff --git a/src/eio/configure.ac → src/unix/eio/configure.ac b/src/eio/configure.ac → src/unix/eio/configure.ac
diff --git a/src/eio/demo.c → src/unix/eio/demo.c b/src/eio/demo.c → src/unix/eio/demo.c
diff --git a/src/eio/ecb.h → src/unix/eio/ecb.h b/src/eio/ecb.h → src/unix/eio/ecb.h
diff --git a/src/eio/eio.3 → src/unix/eio/eio.3 b/src/eio/eio.3 → src/unix/eio/eio.3
diff --git a/src/eio/eio.c → src/unix/eio/eio.c b/src/eio/eio.c → src/unix/eio/eio.c
diff --git a/src/eio/eio.pod → src/unix/eio/eio.pod b/src/eio/eio.pod → src/unix/eio/eio.pod
diff --git a/src/eio/libeio.m4 → src/unix/eio/libeio.m4 b/src/eio/libeio.m4 → src/unix/eio/libeio.m4
diff --git a/src/eio/xthread.h → src/unix/eio/xthread.h b/src/eio/xthread.h → src/unix/eio/xthread.h
diff --git a/src/uv-eio.c → src/unix/uv-eio.c b/src/uv-eio.c → src/unix/uv-eio.c
diff --git a/src/uv-eio.h → src/unix/uv-eio.h b/src/uv-eio.h → src/unix/uv-eio.h
diff --git a/uv.gyp b/uv.gyp
@@ -140,14 +140,14 @@
             'include/ev.h',
             'include/ngx-queue.h',
             'include/uv-unix.h',
-            'src/uv-eio.c',
-            'src/uv-eio.h',
             'src/uv-unix.c',
+            'src/unix/uv-eio.c',
+            'src/unix/uv-eio.h',
             'src/unix/fs.c',
             'src/unix/internal.h',
-            'src/eio/ecb.h',
-            'src/eio/eio.c',
-            'src/eio/xthread.h',
+            'src/unix/eio/ecb.h',
+            'src/unix/eio/eio.c',
+            'src/unix/eio/xthread.h',
             'src/ev/ev.c',
             'src/ev/ev_vars.h',
             'src/ev/ev_wrap.h',
@@ -159,11 +159,11 @@
             'src/ares/config_linux/ares_config.h',
             'src/ares/config_openbsd/ares_config.h',
             'src/ares/config_sunos/ares_config.h',
-            'src/eio/config_cygwin.h',
-            'src/eio/config_darwin.h',
-            'src/eio/config_freebsd.h',
-            'src/eio/config_linux.h',
-            'src/eio/config_sunos.h',
+            'src/unix/eio/config_cygwin.h',
+            'src/unix/eio/config_darwin.h',
+            'src/unix/eio/config_freebsd.h',
+            'src/unix/eio/config_linux.h',
+            'src/unix/eio/config_sunos.h',
             'src/ev/config_cygwin.h',
             'src/ev/config_darwin.h',
             'src/ev/config_freebsd.h',