some cleanups

2 files changed, 12 insertions, 10 deletions

diff --git a/fastled.mk b/fastled.mk
index d6ea527..50ac2d4 100644
--- a/fastled.mk
+++ b/fastled.mk
@@ -23,6 +23,7 @@
 include $(SPREADAVR_PATH)/defines.mk
 
 SRC:=$(wildcard $(FASTLED_PATH)/*.cpp)
+DEPLIBS := arduino-stub
 
 CXXFLAGS += -I$(FASTLED_PATH)
 CXXFLAGS += -DARDUINO
@@ -30,16 +31,16 @@ CXXFLAGS += -DNEED_CXX_BITS
 CXXFLAGS += $(FASTLED_OPTS)
 
 OBJ = $(SRC:%.cpp=%.o)
-OBJ_DEP = dep-fastled--arduino-stub.o
+OBJ_DEPLIB = $(DEPLIBS:%=deplib-fastled--%.o)
 
-libfastled.a: $(OBJ) $(OBJ_DEP)
-	$(AR) $@ $(OBJ) $(OBJ_DEP)
+libfastled.a: $(OBJ) $(OBJ_DEPLIB)
+	$(AR) $@ $(OBJ) $(OBJ_DEPLIB)
 
 %.o: %.cpp
 	$(CXX) -c $(CXXFLAGS) $< -o $@
 
-dep-fastled--%.o: $(LIB_DIR)/%.cpp
+deplib-fastled--%.o: $(LIB_DIR)/%.cpp
 	$(CXX) $(CXXFLAGS) -c $< -o $@
 
 clean:
-	rm -f $(SRC:%.cpp=%.o)
+	rm -f $(SRC:%.cpp=%.o) $(OBJ_DEPLIB)
diff --git a/pjon.mk b/pjon.mk
index 74e9f2a..a8fc01c 100644
--- a/pjon.mk
+++ b/pjon.mk
@@ -23,22 +23,23 @@
 include $(SPREADAVR_PATH)/defines.mk
 
 SRC:=$(wildcard $(PJON_PATH)/*.cpp)
+DEPLIBS := arduino-stub
 
 CXXFLAGS += -I$(PJON_PATH)
 CXXFLAGS += -DARDUINO=101
 CXXFLAGS += $(PJON_OPTS)
 
 OBJ = $(SRC:%.cpp=%.o)
-OBJ_DEP = dep-pjon--arduino-stub.o
+OBJ_DEPLIB = $(DEPLIBS:%=deplib-pjon--%.o)
 
-libpjon.a: $(OBJ) $(OBJ_DEP)
-	$(AR) $@ $(OBJ) $(OBJ_DEP)
+libpjon.a: $(OBJ) $(OBJ_DEPLIB)
+	$(AR) $@ $(OBJ) $(OBJ_DEPLIB)
 
 %.o: %.cpp
 	$(CXX) -c $(CXXFLAGS) $< -o $@
 
-dep-pjon--%.o: $(LIB_DIR)/%.cpp
+deplib-pjon--%.o: $(LIB_DIR)/%.cpp
 	$(CXX) $(CXXFLAGS) -c $< -o $@
 
 clean:
-	rm -f $(SRC:%.cpp=%.o)
+	rm -f $(SRC:%.cpp=%.o) $(OBJ_DEPLIB)