From 1d27ee5126f3cbe5929849e3a8be5f62401339f9 Mon Sep 17 00:00:00 2001 From: Sergey Avseyev Date: Wed, 19 Dec 2012 14:28:52 +0300 Subject: [PATCH] Enable NGINX sources, add target for nginx tests Change-Id: I26a998bbfa5f7a41dd1ff54355d8981e9dddcfee --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index dae804f..16f025d 100644 --- a/Makefile +++ b/Makefile @@ -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 \ @@ -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 #