diff --git a/Makefile b/Makefile
index 8bb6434..111c339 100644
--- a/Makefile
+++ b/Makefile
@@ -1,26 +1,28 @@
-CC?=cc
+CC?=
 PREFIX?=/usr/local
-CFLAGS=-Wall -Wextra -g -O2 -pipe -funroll-loops -ffast-math -fno-strict-aliasing
 CPPFLAGS=-I./libpidutil -I$(PREFIX)/include
-LDFLAGS=-L$(PREFIX)/lib -L./libpidutil -lpidutil -lpthread
-LDLIB=-lpidutil -lpthread
+CFLAGS=-Wall -Wextra -g -O2 -pipe -funroll-loops -ffast-math -fno-strict-aliasing
+CFLAGS+=$(CPPFLAGS)
+LDFLAGS=-L$(PREFIX)/lib -L./libpidutil
+LDLIBS=-lpidutil -lpthread
 
 SUBDIRS = libpidutil
 PROGS = fsipd logfile_test
-CFILES = fsipd.c logfile.c
+OBJ = logfile.o fsipd.o
 
 all: $(SUBDIRS) fsipd
 
-fsipd: $(CFILES)
+fsipd: $(OBJ)
+	$(CC) $(LDFLAGS) $(OBJ) $(LDLIBS) -o fsipd
 
 .PHONY: $(SUBDIRS)
-
+	
 $(SUBDIRS):
 	git submodule update --init $@
 	$(MAKE) -C $@ all
 
 test: logfile.c logfile_test.c
-	$(CC) $(CFLAGS) $(INC) $(LDFLAGS) logfile.c logfile_test.c -o logfile_test
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) logfile.c logfile_test.c -o logfile_test
 
 clean:
 	rm -f *.BAK *.log *.o *.a a.out core temp.* $(PROGS)