Skip to content

Commit 4546e8c

Browse files
author
Dane Springmeyer
committed
get rid of configure and other makefile touchups
1 parent a838840 commit 4546e8c

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
all: ./build server client
2+
all: ./build ./webclient ./webserver
33

44
./deps/http-parser:
55
git clone --depth 1 git://github.com/joyent/http-parser.git ./deps/http-parser
@@ -11,13 +11,13 @@ all: ./build server client
1111
git clone --depth 1 https://chromium.googlesource.com/external/gyp.git ./deps/gyp
1212

1313
./build: ./deps/gyp ./deps/libuv ./deps/http-parser
14-
./configure
14+
deps/gyp/gyp --depth=. -Goutput_dir=./out -Icommon.gypi --generator-output=./build -Dlibrary=static_library -f make
1515

16-
client:
16+
./webclient:
1717
make -C ./build/ webclient
1818
cp ./build/out/Release/webclient ./webclient
1919

20-
server:
20+
./webserver:
2121
make -C ./build/ webserver
2222
cp ./build/out/Release/webserver ./webserver
2323

configure

-3
This file was deleted.

0 commit comments

Comments
 (0)