fix build and make bootstrap

richardhundt · Nov 9, 2012 · 2606a58 · 2606a58
1 parent e9b4475
commit 2606a58
Show file tree

Hide file tree

Showing 5 changed files with 455 additions and 470 deletions.
diff --git a/Makefile b/Makefile
@@ -2,15 +2,14 @@ SRCDIR=./src
 BLDDIR=./build
 LPEGDIR=./deps/lpeg
 LUADIR=./deps/luajit
-LUVDIR=./deps/luv
 LIBDIR=./lib
 BINDIR=${BLDDIR}/bin
 
 OS_NAME=$(shell uname -s)
 MH_NAME=$(shell uname -m)
 
 CFLAGS=-O2 -Wall
-LDFLAGS=-lluv -lluajit -lstdc++ -lm -ldl -lpthread
+LDFLAGS=-lluajit -lstdc++ -lm -ldl -lpthread
 
 ifeq (${OS_NAME}, Darwin)
 ifeq (${MH_NAME}, x86_64)
@@ -21,8 +20,8 @@ CFLAGS+=-Wl,-E -fomit-frame-pointer -fno-stack-protector
 LDFLAGS+=-lrt
 endif
 
-INCS=-I${LUVDIR}/src -I${LUADIR}/src -L${LUADIR}/src -L${LUVDIR}/src -I${LUVDIR}/src/zmq/include -I${LUVDIR}/src/uv/include
+INCS=-I${LUADIR}/src -L${LUADIR}/src
-DEPS=${LUADIR}/src/libluajit.a ${LIBDIR}/lpeg.so ${LIBDIR}/luv.so
+DEPS=${LUADIR}/src/libluajit.a ${LIBDIR}/lpeg.so
 
 all: ${BINDIR}/lupa
 
@@ -39,11 +38,6 @@ ${LIBDIR}/lpeg.so:
 	${MAKE} -C ${LPEGDIR}
 	cp ${LPEGDIR}/lpeg.so ${LIBDIR}/lpeg.so
 
-${LIBDIR}/luv.so:
-	git submodule update --init ${LUVDIR}
-	${MAKE} -C ${LUVDIR}
-	cp ${LUVDIR}/src/luv.so ${LIBDIR}/luv.so
-
 clean:
 	rm -rf ${BLDDIR}
 	rm -f ./lib/*.so

diff --git a/lib/lupa/core.lua b/lib/lupa/core.lua