diff --git a/Makefile b/Makefile
index 720dec4..8d2bab7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,22 @@
-CFLAGS := -O2 -pipe -Wall
+TARGET = telnetproxy
 
-OBJS := configfile.o connection.o event.o logging.o tcpsocket.o sockaddr.o
+CFLAGS = -Wall -O2 -MD -MP -MF $(*F).d
 
-all: telnetproxy
+# ------
 
-telnetproxy: $(OBJS) telnetproxy.o
-	$(CC) $(CFLAGS) $^ -o $@
+SRC := $(wildcard *.c)
+
+all: $(TARGET)
+
+$(TARGET): $(SRC:.c=.o)
+	@echo " Linking file:  $@"
+	@$(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) > /dev/null
 
 %.o: %.c
-	$(CC) $(CFLAGS) -c $< -o $@
-
-%.d: %.c
-	$(CC) $(CFLAGS) -MM -c $< -o $@
+	@echo " Building file: $<"
+	@$(CC) -c $(CFLAGS) $< -o $@
 
 clean:
-	rm -f telnetproxy *.d *.o *.log
+	rm -rf $(TARGET) *.o *.d
 
-DEPS := $(wildcard *.c)
--include $(DEPS:.c=.d)
+-include $(shell find -name *.d 2> /dev/null)