diff --git a/Makefile b/Makefile
index 51a1b51..20c9ecf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,16 @@
+PROG ?= ustreamer
 DESTDIR ?=
 PREFIX ?= /usr/local
+
+CC ?= gcc
 CFLAGS ?= -O3
 LDFLAGS ?=
-CC ?= gcc
 
 
 # =====
 LIBS = -lm -ljpeg -pthread -levent -levent_pthreads -luuid
 override CFLAGS += -c -std=c11 -Wall -Wextra -D_GNU_SOURCE
 SOURCES = $(shell ls src/*.c src/http/*.c src/encoders/cpu/*.c src/encoders/hw/*.c)
-PROG = ustreamer
 
 ifeq ($(shell ls -d /opt/vc/include 2>/dev/null), /opt/vc/include)
 SOURCES += $(shell ls src/encoders/omx/*.c)
@@ -17,8 +18,6 @@ LIBS += -lbcm_host -lvcos -lopenmaxil -L/opt/vc/lib
 override CFLAGS += -DWITH_OMX_ENCODER -DOMX_SKIP64BIT -I/opt/vc/include
 endif
 
-OBJECTS = $(SOURCES:.c=.o)
-
 
 # =====
 all: $(SOURCES) $(PROG)
@@ -41,12 +40,12 @@ regen:
 	tools/make-html-h.py src/http/data/index.html src/http/data/index_html.h INDEX
 
 
-$(PROG): $(OBJECTS)
-	$(CC) $(LIBS) $(LDFLAGS) $(OBJECTS) -o $@
+$(PROG): $(SOURCES:.c=.o)
+	$(CC) $(SOURCES:.c=.o) -o $@ $(LDFLAGS) $(LIBS)
 
 
 .c.o:
-	$(CC) $(LIBS) $(CFLAGS) $< -o $@
+	$(CC) $< -o $@ $(CFLAGS) $(LIBS)
 
 
 release:
@@ -65,6 +64,7 @@ push:
 	git push
 	git push --tags
 
+
 clean-all: clean
 clean:
 	find src -name '*.o' -exec rm '{}' \;