commit f4c911904be62d8f4021db2be6545fbb1905c18a
author Seth Falcon <seth@opscode.com> Tue Oct 09 15:54:48 2012 -0700
committer Seth Falcon <seth@opscode.com> Tue Oct 09 15:54:48 2012 -0700
tree e307fe965c2f13ff6221468863df77214ae954be
parent 3c067743df07973e1b10bbb0e87bea9cccae4ec6
parent 332c8040ee2065dc993f6dc8eb4ca9c439683110

Merge branch 'rebar-config-cleanup-for-master'

Makefile

diff --git a/Makefile b/Makefile
index 7bca978..008787d 100644
--- a/Makefile
+++ b/Makefile
@@ -9,3 +9,4 @@
 clean:
 	@rebar clean
 
+.PHONY: clean compile tests

c_src/Makefile

diff --git a/c_src/Makefile b/c_src/Makefile
index 86fcca6..a4bcd32 100644
--- a/c_src/Makefile
+++ b/c_src/Makefile
@@ -1,6 +1,9 @@
-compile:
-	env
-	$(CC) $(CFLAGS) $(ERL_CFLAGS) $(EXE_LDFLAGS) bcrypt_port.c bcrypt.o blowfish.o -o ../priv/bcrypt
+compile: ../priv/bcrypt
+
+../priv/bcrypt:
+	$(CC) $(CFLAGS) $(ERL_CFLAGS) $(EXE_LDFLAGS) bcrypt_port.c bcrypt.o blowfish.o $(LDFLAGS) $(ERL_LDFLAGS) -lpthread -o ../priv/bcrypt
 
 clean:
 	@rm -f ../priv/bcrypt
+
+.PHONY: clean compile