--- a/usr/Makefile
+++ b/usr/Makefile
@@ -1,16 +1,15 @@
-CFLAGS += -O2 -fno-inline -Wall -Wstrict-prototypes -g -I../include
+CFLAGS ?= -O2 -fno-inline -g
 CFLAGS += -D_GNU_SOURCE # required for glibc >= 2.8
+WARNFLAGS = -Wall -Wstrict-prototypes
+CFLAGS += $(WARNFLAGS) -I../include
 PROGRAMS = ietd ietadm
-LIBS = -lcrypto
+LDLIBS = -lcrypto
 
 all: $(PROGRAMS)
 
 ietd: ietd.o iscsid.o conn.o session.o target.o message.o ctldev.o log.o chap.o event.o param.o plain.o isns.o
 
-	$(CC) $^ -o $@ $(LIBS)
-
 ietadm: ietadm.o param.o
-	$(CC) $^ -o $@
 
 clean:
 	rm -f *.o $(PROGRAMS)