From 9552edf82dbdf643640f8ed95ab4777ff3e96841 Mon Sep 17 00:00:00 2001
From: hagen <hagen@mail.i2p>
Date: Fri, 12 Dec 2014 07:39:35 +0000
Subject: [PATCH] * (2/3) update main Makefile

---
 Makefile | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 560a607a..bb17530f 100644
--- a/Makefile
+++ b/Makefile
@@ -19,19 +19,20 @@ endif
 
 all: obj $(SHLIB) $(I2PD)
 
-.SUFFIXES:
-.SUFFIXES:	.c .cc .C .cpp .o
+obj:
+	mkdir -p obj
 
+# weaker rule for building files without headers
 obj/%.o : %.cpp
 	$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) $(CPU_FLAGS) -c -o $@ $<
 
-obj:
-	mkdir -p obj
+obj/%.o : %.cpp %.h
+	$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) $(CPU_FLAGS) -c -o $@ $<
 
-$(I2PD):  $(OBJECTS:obj/%=obj/%)
+$(I2PD):  $(patsubst %.cpp,obj/%.o,$(DAEMON_SRC))
 	$(CXX) -o $@ $^ $(LDLIBS) $(LDFLAGS) $(LIBS)
 
-$(SHLIB): $(OBJECTS:obj/%=obj/%) api.cpp
+$(SHLIB): $(patsubst %.cpp,obj/%.o,$(LIB_SRC))
 	$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) $(CPU_FLAGS) -shared -o $@ $^
 
 clean: