Skip to content

Commit

Permalink
Merge pull request #12 from avsej/nginx-test
Browse files Browse the repository at this point in the history
Enable NGINX sources, add target for nginx tests
  • Loading branch information
trondn committed Dec 19, 2012
2 parents 306afd2 + 1d27ee5 commit 5cb2744
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions Makefile
Expand Up @@ -7,8 +7,8 @@ RUBYCLIENTSOURCE:= $(shell find ruby/client -name "*.rb" -o -name "*.[ch]")
VACUUMSOURCE := $(shell find demo/vacuum -name "*.[ch]*")
PLUGINLESSSTEP1SOURCE := $(shell find demo/pluginless/step1 -name "*.[ch]*")
PLUGINLESSSTEP2SOURCE := $(shell find demo/pluginless/step2 -name "*.[ch]*")
#NGINXSOURCE := $(shell find nginx -name "*.[ch]*")
#NGINXMODULESOURCE := $(shell find nginx-module -name "*.[ch]*")
NGINXSOURCE := $(shell find nginx -name "*.[ch]*")
NGINXMODULESOURCE := $(shell find nginx-module -name "*.[ch]*")

all: lcb/libcouchbase.la \
php/modules/couchbase.so \
Expand Down Expand Up @@ -103,6 +103,9 @@ nginx/objs/nginx: lcb/libcouchbase.la nginx/objs/Makefile $(NGINXSOURCE) $(NGINX
nginx/objs/Makefile: nginx/auto/configure nginx-module/config
(cd nginx; ./auto/configure --prefix=$(PREFIX) --with-debug --add-module=$(TOPDIR)/nginx-module)

nginx-module-test: nginx-module
(cd nginx-module; PATH=$(PREFIX)/sbin:$(PATH) prove)

#
# Demo programs
#
Expand Down

0 comments on commit 5cb2744

Please sign in to comment.