projects
/
blerg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add scrypt library and scrypt support to auth
[blerg.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
e51f40a
..
60bf441
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,7
+1,7
@@
include libs.mk
CFLAGS ?= -g
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 ?=
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
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 b
uilddeps/scrypt.a b
lerg.a
all: $(targets)
clean:
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)
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
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/