Cleanup dep files

Makefile

@@ -135,13 +135,17 @@ LDFLAGS := -Lcommon/lib -Lcontroller/lib -Lconsole/console/lib -Llib -Wl,--as-ne
 VPATH += common/lib controller/lib console/console/lib lib
 
 
-SRCS_TMP=$(SRCS:.il=.il.d)
--include $(SRCS_TMP:.c=.d) $(patsubst %.c,.libs/%.d,$(SRCS_TMP))
+SRCS_TMP:=$(SRCS:.il=.il2c.d)
+DEPS:=$(SRCS_TMP:.c=.d)
+DEPSLIBS:=$(foreach DEP,$(DEPS),$(dir $(DEP)).libs/$(notdir $(DEP)))
+-include $(DEPS) $(DEPSLIBS)
+
+CLEAN += $(DEPS) $(DEPSLIBS)
 
 SRCS_IL = $(filter %.il,$(SRCS))
 $(SRCS_IL): $(IL2C)
 
 
 subdirs_CLEAN:
-	rm -rf $(CLEAN)
+	$(foreach CLEANITEM,$(CLEAN), rm -rf $(CLEANITEM);)
 

common/trace/build.mk

@@ -47,6 +47,12 @@ $(DIR)/trace_view_LDFLAGS += -ltrace
 $(DIR)/trace_view: $(TRACE_VIEW_OBJS)
 
 TARGETS += $(TRACE_TARGETS)
+SRCS += $(ARCHSRCS)
+SRCS += $(TRACE_DUMP_SRCS)
+SRCS += $(TRACE_DUMPDIFF_SRCS)
+SRCS += $(TRACE_FFT_SRCS)
+SRCS += $(TRACE_LIST_SRCS)
+SRCS += $(TRACE_VIEW_SRCS)
 CLEAN += $(TRACE_TARGETS) $(ARCHOBJS)
 CLEAN += $(TRACE_DUMP_OBJS)
 CLEAN += $(TRACE_DUMPDIFF_OBJS)

console/console/predictlib/build.mk

@@ -20,19 +20,21 @@ PREDICTLIB_TARGETS += $(DIR)/test-001
 $(DIR)/test-001_LDFLAGS += -lpredict
 $(DIR)/test-001: libpredict.la
 $(DIR)/test-001: $(DIR)/test-001.o
-PREDICTLIB_SRCS += $(DIR)test-001.c
+PREDICTLIB_SRCS += $(DIR)/test-001.c
 
 PREDICTLIB_TARGETS += $(DIR)/test-002
 $(DIR)/test-002_LDFLAGS += -lpredict
 $(DIR)/test-002: libpredict.la
 $(DIR)/test-002: $(DIR)/test-002.o
-PREDICTLIB_SRCS += $(DIR)test-002.c
+PREDICTLIB_SRCS += $(DIR)/test-002.c
 
 PREDICTLIB_TARGETS += $(DIR)/test-003
 $(DIR)/test-003_LDFLAGS += -lpredict
 $(DIR)/test-003: libpredict.la
 $(DIR)/test-003: $(DIR)/test-003.o
-PREDICTLIB_SRCS += $(DIR)test-003.c
+PREDICTLIB_SRCS += $(DIR)/test-003.c
+
+PREDICTLIB_OBJS := $(PREDICTLIB_SRCS:.c=.lo)
 
 SRCS += $(PREDICTLIB_SRCS)
 TARGETS += $(PREDICTLIB_TARGETS)