From c4811dd1b73b37b0916803097237acd31f1df98b Mon Sep 17 00:00:00 2001 From: Harsh Sharma Date: Tue, 7 Jan 2020 15:50:56 -0600 Subject: Refactored accessory cards classes with inheritence, fixed Makefile clean, moved some helper functions to header utility --- Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index f6df6d7..2fc0729 100644 --- a/Makefile +++ b/Makefile @@ -43,9 +43,8 @@ SOURCES = $(wildcard $(SOURCEDIR)/**/*.cpp) SOURCES += $(SOURCEDIR)/Version.cpp OBJS1 = $(patsubst $(SOURCEDIR)/%.cpp,$(BUILDDIR)/%.o,$(SOURCES)) OBJS = $(patsubst $(SOURCEDIR)/%.c,$(BUILDDIR)/%.o,$(OBJS1)) -CPP_DEPPS1 = $(patsubst $(SOURCEDIR)/%.cpp,$(BUILDDIR)/%.d,$(SOURCES)) -CPP_DEPPS = $(patsubst $(SOURCEDIR)/%.c,$(BUILDDIR)/%.d,$(CPP_DEPPS1)) -CPP_DEPPS = $(BUILDDIR)/MtsIo.d +CPP_DEPPS = $(patsubst $(SOURCEDIR)/%.cpp,$(BUILDDIR)/**/%.d,$(SOURCES)) +CPP_DEPPS += $(BUILDDIR)/MtsIoSysfs.o $(BUILDDIR)/**/*.o $(BUILDDIR)/**/*.d JS_OBJS = $(BUILDDIR)/Version.o OUT_DIRS=build/AccessoryCards build/Device MKDIR_P = mkdir -p @@ -115,7 +114,7 @@ strip: $(STRIP) $(BUILDDIR)/mts-io-sysfs clean: - -$(RM) $(OBJS) $(CPP_DEPPS) $(BUILDDIR)/mts-io-sysfs $(BUILDDIR)/MtsIoSysfs.o $(BUILDDIR)/AccessoryCards/*.o $(BUILDDIR)/Device/*.o + -$(RM) $(OBJS) $(CPP_DEPPS) $(BUILDDIR)/mts-io-sysfs -@echo ' ' .PHONY: all clean dependents -- cgit v1.2.3