X-Git-Url: http://git.bytex64.net/?a=blobdiff_plain;f=Makefile;h=3c33329909e76604da7fbd3c1a19d2f9220957de;hb=a4fca9b6cbc780b602b86ccc5819dc0ee99d5771;hp=e305aaa90fc561b2eec3783e85780386b927df99;hpb=0647b76522be38edfe4b1fbae32addbbf8bb4128;p=blerg.git diff --git a/Makefile b/Makefile index e305aaa..3c33329 100644 --- a/Makefile +++ b/Makefile @@ -24,8 +24,8 @@ all: $(targets) clean: rm -f $(targets) $(blerg_a_objects) $(blerg_auth_a_objects) $(blergtool_objects) $(blerglatest_objects) $(http_blerg_objects) $(cgi_blerg_objects) builddeps/*.a - @make -C builddeps/scrypt-1.1.6 distclean - @make -C builddeps/scrypt-1.1.6/lib/crypto clean + @-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) @@ -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