X-Git-Url: http://git.bytex64.net/?a=blobdiff_plain;f=Makefile;h=c35d1f16d746df5d9c241e654decc19cfe7a86ed;hb=65363bdbdec43b2efd906d8fa848fc4d69c529d2;hp=eb99c154ef2ee82e6d5e7112fde588cc92020934;hpb=09ed7fdfdaa09307dfc9256a4e7488fa6cec0a7c;p=blerg.git

diff --git a/Makefile b/Makefile
index eb99c15..c35d1f1 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ HTTP_LIBDIRS = $(MHD_LIBDIR) $(YAJL_LIBDIR)
 CGI_LIBDIRS = $(CGI_UTIL_LIBDIR) $(YAJL_LIBDIR)
 
 targets = blerg.a blerg_auth.a blergtool blerglatest blerg.cgi www/build/enyo-blerg.js
-blerg_a_objects = database/database.o database/tags.o database/util.o database/subscription.o common/stringbucket.o
+blerg_a_objects = database/database.o database/tags.o database/util.o database/configuration.o database/subscription.o common/stringbucket.o
 blerg_auth_a_objects = common/auth.o common/md5.o
 blergtool_objects = tools/blergtool.o blerg.a
 blerglatest_objects = tools/blerglatest.o blerg.a common/json.o
@@ -34,25 +34,25 @@ blerg_auth.a: builddeps/scrypt.a $(blerg_auth_a_objects)
 	ar rcu $@ $(blerg_auth_a_objects)
 
 blergtool: $(blergtool_objects)
-	gcc $(LDFLAGS) $^ -o $@
+	$(CC) $(LDFLAGS) $^ -o $@
 
 blerglatest: $(blerglatest_objects)
-	gcc $(YAJL_LIBDIR) $(LDFLAGS) $^ -lyajl_s -o $@
+	$(CC) $(YAJL_LIBDIR) $(LDFLAGS) $^ -lyajl_s -o $@
 
 blerg.httpd: $(http_blerg_objects)
-	gcc $(HTTP_LIBDIRS) $(LDFLAGS) $(http_blerg_objects) -lpthread -lmicrohttpd -lyajl_s -o $@
+	$(CC) $(HTTP_LIBDIRS) $(LDFLAGS) $(http_blerg_objects) -lpthread -lmicrohttpd -lyajl_s -o $@
 
 blerg.cgi: $(cgi_blerg_objects)
-	gcc $(CGI_LIBDIRS) $(LDFLAGS) $(cgi_blerg_objects) -lcgi-util -lyajl_s -o $@
+	$(CC) $(CGI_LIBDIRS) $(LDFLAGS) $(cgi_blerg_objects) -lcgi-util -lyajl_s -o $@
 
 http/%.o: http/%.c
-	gcc $(INCLUDES) $(HTTP_INCLUDES) $(CFLAGS) -c $< -o $@
+	$(CC) $(INCLUDES) $(HTTP_INCLUDES) $(CFLAGS) -c $< -o $@
 
 cgi/%.o: cgi/%.c
-	gcc $(INCLUDES) $(CGI_INCLUDES) $(CFLAGS) -c $< -o $@
+	$(CC) $(INCLUDES) $(CGI_INCLUDES) $(CFLAGS) -c $< -o $@
 
 %.o: %.c
-	gcc $(INCLUDES) $(CFLAGS) -c $< -o $@
+	$(CC) $(INCLUDES) $(CFLAGS) -c $< -o $@
 
 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
@@ -62,5 +62,5 @@ 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
+	make -C builddeps/scrypt-1.1.6/lib/crypto CFLAGS="$(CFLAGS)"
 	cp builddeps/scrypt-1.1.6/lib/crypto/scrypt.a builddeps/