Move src/ev to src/unix/ev

joyent · Aug 31, 2011 · 1408ac4 · 1408ac4
1 parent 5fd68a0
commit 1408ac4
Show file tree

Hide file tree

Showing 39 changed files with 17 additions and 17 deletions.
diff --git a/config-unix.mk b/config-unix.mk
@@ -23,7 +23,7 @@ AR = $(PREFIX)ar
 E=
 CSTDFLAG=--std=c89 -pedantic -Wall -Wextra -Wno-unused-parameter
 CFLAGS=-g
-CPPFLAGS += -Isrc/ev
+CPPFLAGS += -Isrc/unix/ev
 LINKFLAGS=-lm
 
 CPPFLAGS += -D_LARGEFILE_SOURCE
@@ -85,8 +85,8 @@ 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/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 \
+uv.a: src/uv-unix.o src/unix/fs.o src/uv-common.o src/uv-platform.o src/unix/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/unix/ev/ev.o \
 		src/unix/eio/eio.o $(CARES_OBJS)
 
 src/uv-platform.o: src/unix/$(UV_OS_FILE) include/uv.h include/uv-unix.h
@@ -101,8 +101,8 @@ src/unix/fs.o: src/unix/fs.c include/uv.h include/uv-unix.h src/unix/internal.h
 src/uv-common.o: src/uv-common.c include/uv.h include/uv-unix.h
 	$(CC) $(CSTDFLAG) $(CPPFLAGS) $(CFLAGS) -c src/uv-common.c -o src/uv-common.o
 
-src/ev/ev.o: src/ev/ev.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c src/ev/ev.c -o src/ev/ev.o -DEV_CONFIG_H=\"$(EV_CONFIG)\"
+src/unix/ev/ev.o: src/unix/ev/ev.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c src/unix/ev/ev.c -o src/unix/ev/ev.o -DEV_CONFIG_H=\"$(EV_CONFIG)\"
 
 
 EIO_CPPFLAGS += $(CPPFLAGS)
@@ -119,14 +119,14 @@ src/unix/uv-eio.o: src/unix/uv-eio.c
 
 clean-platform:
 	-rm -f src/ares/*.o
-	-rm -f src/ev/*.o
+	-rm -f src/unix/ev/*.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/unix/ev/*.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/ev/Changes → src/unix/ev/Changes b/src/ev/Changes → src/unix/ev/Changes
diff --git a/src/ev/LICENSE → src/unix/ev/LICENSE b/src/ev/LICENSE → src/unix/ev/LICENSE
diff --git a/src/ev/Makefile.am → src/unix/ev/Makefile.am b/src/ev/Makefile.am → src/unix/ev/Makefile.am
diff --git a/src/ev/Makefile.in → src/unix/ev/Makefile.in b/src/ev/Makefile.in → src/unix/ev/Makefile.in
diff --git a/src/ev/README → src/unix/ev/README b/src/ev/README → src/unix/ev/README
diff --git a/src/ev/aclocal.m4 → src/unix/ev/aclocal.m4 b/src/ev/aclocal.m4 → src/unix/ev/aclocal.m4
diff --git a/src/ev/autogen.sh → src/unix/ev/autogen.sh b/src/ev/autogen.sh → src/unix/ev/autogen.sh
diff --git a/src/ev/config.guess → src/unix/ev/config.guess b/src/ev/config.guess → src/unix/ev/config.guess
diff --git a/src/ev/config.h.in → src/unix/ev/config.h.in b/src/ev/config.h.in → src/unix/ev/config.h.in
diff --git a/src/ev/config.sub → src/unix/ev/config.sub b/src/ev/config.sub → src/unix/ev/config.sub
diff --git a/src/ev/config_cygwin.h → src/unix/ev/config_cygwin.h b/src/ev/config_cygwin.h → src/unix/ev/config_cygwin.h
diff --git a/src/ev/config_darwin.h → src/unix/ev/config_darwin.h b/src/ev/config_darwin.h → src/unix/ev/config_darwin.h
diff --git a/src/ev/config_freebsd.h → src/unix/ev/config_freebsd.h b/src/ev/config_freebsd.h → src/unix/ev/config_freebsd.h
diff --git a/src/ev/config_linux.h → src/unix/ev/config_linux.h b/src/ev/config_linux.h → src/unix/ev/config_linux.h
diff --git a/src/ev/config_sunos.h → src/unix/ev/config_sunos.h b/src/ev/config_sunos.h → src/unix/ev/config_sunos.h
diff --git a/src/ev/configure → src/unix/ev/configure b/src/ev/configure → src/unix/ev/configure
diff --git a/src/ev/configure.ac → src/unix/ev/configure.ac b/src/ev/configure.ac → src/unix/ev/configure.ac
diff --git a/src/ev/depcomp → src/unix/ev/depcomp b/src/ev/depcomp → src/unix/ev/depcomp
diff --git a/src/ev/ev++.h → src/unix/ev/ev++.h b/src/ev/ev++.h → src/unix/ev/ev++.h
diff --git a/src/ev/ev.3 → src/unix/ev/ev.3 b/src/ev/ev.3 → src/unix/ev/ev.3
diff --git a/src/ev/ev.c → src/unix/ev/ev.c b/src/ev/ev.c → src/unix/ev/ev.c
diff --git a/src/ev/ev.pod → src/unix/ev/ev.pod b/src/ev/ev.pod → src/unix/ev/ev.pod
diff --git a/src/ev/ev_epoll.c → src/unix/ev/ev_epoll.c b/src/ev/ev_epoll.c → src/unix/ev/ev_epoll.c
diff --git a/src/ev/ev_kqueue.c → src/unix/ev/ev_kqueue.c b/src/ev/ev_kqueue.c → src/unix/ev/ev_kqueue.c
diff --git a/src/ev/ev_poll.c → src/unix/ev/ev_poll.c b/src/ev/ev_poll.c → src/unix/ev/ev_poll.c
diff --git a/src/ev/ev_port.c → src/unix/ev/ev_port.c b/src/ev/ev_port.c → src/unix/ev/ev_port.c
diff --git a/src/ev/ev_select.c → src/unix/ev/ev_select.c b/src/ev/ev_select.c → src/unix/ev/ev_select.c
diff --git a/src/ev/ev_vars.h → src/unix/ev/ev_vars.h b/src/ev/ev_vars.h → src/unix/ev/ev_vars.h
diff --git a/src/ev/ev_win32.c → src/unix/ev/ev_win32.c b/src/ev/ev_win32.c → src/unix/ev/ev_win32.c
diff --git a/src/ev/ev_wrap.h → src/unix/ev/ev_wrap.h b/src/ev/ev_wrap.h → src/unix/ev/ev_wrap.h
diff --git a/src/ev/event.c → src/unix/ev/event.c b/src/ev/event.c → src/unix/ev/event.c
diff --git a/src/ev/event.h → src/unix/ev/event.h b/src/ev/event.h → src/unix/ev/event.h
diff --git a/src/ev/install-sh → src/unix/ev/install-sh b/src/ev/install-sh → src/unix/ev/install-sh
diff --git a/src/ev/libev.m4 → src/unix/ev/libev.m4 b/src/ev/libev.m4 → src/unix/ev/libev.m4
diff --git a/src/ev/ltmain.sh → src/unix/ev/ltmain.sh b/src/ev/ltmain.sh → src/unix/ev/ltmain.sh
diff --git a/src/ev/missing → src/unix/ev/missing b/src/ev/missing → src/unix/ev/missing
diff --git a/src/ev/mkinstalldirs → src/unix/ev/mkinstalldirs b/src/ev/mkinstalldirs → src/unix/ev/mkinstalldirs
diff --git a/uv.gyp b/uv.gyp
@@ -148,10 +148,10 @@
             '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',
-            'src/ev/event.h',
+            'src/unix/ev/ev.c',
+            'src/unix/ev/ev_vars.h',
+            'src/unix/ev/ev_wrap.h',
+            'src/unix/ev/event.h',
             # TODO: conditionally include the following based on OS?
             'src/ares/config_cygwin/ares_config.h',
             'src/ares/config_darwin/ares_config.h',
@@ -164,13 +164,13 @@
             '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',
-            'src/ev/config_linux.h',
-            'src/ev/config_sunos.h',
+            'src/unix/ev/config_cygwin.h',
+            'src/unix/ev/config_darwin.h',
+            'src/unix/ev/config_freebsd.h',
+            'src/unix/ev/config_linux.h',
+            'src/unix/ev/config_sunos.h',
           ],
-          'include_dirs': [ 'src/ev', ],
+          'include_dirs': [ 'src/unix/ev', ],
           'defines': [
             '_LARGEFILE_SOURCE',
             '_FILE_OFFSET_BITS=64',