X-Git-Url: http://git.bytex64.net/?a=blobdiff_plain;f=Makefile;fp=Makefile;h=60bf441224c17fd81e0dde62cc18919d397e6d65;hb=46a8b671b3c707db689868d9b6544d272aa711a7;hp=e51f40a57db9285439ac38a0c64d12125682da69;hpb=e35e2482b85c6e7bbac334a8496472a8b7b0d170;p=blerg.git

diff --git a/Makefile b/Makefile
index e51f40a..60bf441 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 include libs.mk
 
 CFLAGS ?= -g
-INCLUDES = -I. -Idatabase -Icommon $(YAJL_INCLUDES)
+INCLUDES = -I. -Idatabase -Icommon -Ibuilddeps/scrypt-1.1.6/lib/crypto $(YAJL_INCLUDES)
 HTTP_INCLUDES = -Ihttp $(MHD_INCLUDES)
 CGI_INCLUDES = -Icgi $(CGI_UTIL_INCLUDES)
 LDFLAGS ?=
@@ -14,12 +14,14 @@ blergtool_objects = tools/blergtool.o blerg.a
 blerglatest_objects = tools/blerglatest.o blerg.a common/json.o
 rss_objects = cgi/rss.o cgi/canned_responses.o common/app.o common/escapery.o blerg.a
 http_blerg_objects = http/http_blerg.o http/canned_responses.o common/app.o common/json.o common/auth.o common/md5.o blerg.a
-cgi_blerg_objects = cgi/cgi_blerg.o cgi/canned_responses.o common/app.o common/json.o common/auth.o common/md5.o blerg.a
+cgi_blerg_objects = cgi/cgi_blerg.o cgi/canned_responses.o common/app.o common/json.o common/auth.o common/md5.o builddeps/scrypt.a blerg.a
 
 all: $(targets)
 
 clean:
-	rm -f $(targets) $(blerg_a_objects) $(blergtool_objects) $(blerglatest_objects) $(http_blerg_objects) $(cgi_blerg_objects) $(rss_objects)
+	rm -f $(targets) $(blerg_a_objects) $(blergtool_objects) $(blerglatest_objects) $(http_blerg_objects) $(cgi_blerg_objects) $(rss_objects) builddeps/*.a
+	@make -C builddeps/scrypt-1.1.6 distclean
+	@make -C builddeps/scrypt-1.1.6/lib/crypto clean
 
 blerg.a: $(blerg_a_objects)
 	ar rcu $@ $(blerg_a_objects)
@@ -51,3 +53,10 @@ cgi/%.o: cgi/%.c
 www/build/enyo-blerg.js: www/jssrc/blerg/* www/jssrc/package.js www/jssrc/package-min.js
 	which node >/dev/null   # Please install Node.js to re-minify the JS
 	cd www/jssrc && enyo/tools/minify.sh -output ../build/enyo-blerg -no-alias package-min.js
+
+builddeps/scrypt-1.1.6/config.h:
+	cd builddeps/scrypt-1.1.6 && ./configure
+
+builddeps/scrypt.a: builddeps/scrypt-1.1.6/config.h
+	make -C builddeps/scrypt-1.1.6/lib/crypto
+	cp builddeps/scrypt-1.1.6/lib/crypto/scrypt.a builddeps/