From 25025a5471d609d57f59e5d79ab7519635bfe95b Mon Sep 17 00:00:00 2001 From: Tom Finegan Date: Mon, 19 Aug 2013 11:03:45 -0700 Subject: [PATCH] Add dependency checks to Makefile. Avoid unfortunate things like breaking the library because the make file was not previously checking dependencies. Change-Id: Iab20c3cfa0d1475dfb5c54127646b351df1c4c50 --- Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a2186a8..e9a60a4 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ CXX := g++ -CXXFLAGS := -W -Wall -g +CXXFLAGS := -W -Wall -g -MMD -MP LIBWEBMA := libwebm.a LIBWEBMSO := libwebm.so WEBMOBJS := mkvparser.o mkvreader.o mkvmuxer.o mkvmuxerutil.o mkvwriter.o @@ -10,6 +10,8 @@ OBJECTS2 := sample_muxer.o vttreader.o webvttparser.o sample_muxer_metadata.o OBJECTS3 := dumpvtt.o vttreader.o webvttparser.o OBJECTS4 := vttdemux.o webvttparser.o INCLUDES := -I. +DEPS := $(WEBMOBJS:.o=.d) $(OBJECTS1:.o=.d) $(OBJECTS2:.o=.d) +DEPS += $(OBJECTS3:.o=.d) $(OBJECTS4:.o=.d) EXES := samplemuxer sample dumpvtt vttdemux all: $(EXES) @@ -44,4 +46,8 @@ libwebm.so: $(OBJSSO) $(CXX) -c $(CXXFLAGS) -fPIC $(INCLUDES) $< -o $@ clean: - $(RM) -f $(OBJECTS1) $(OBJECTS2) $(OBJECTS3) $(OBJECTS4) $(OBJSA) $(OBJSSO) $(LIBWEBMA) $(LIBWEBMSO) $(EXES) Makefile.bak + $(RM) -f $(OBJECTS1) $(OBJECTS2) $(OBJECTS3) $(OBJECTS4) $(OBJSA) $(OBJSSO) $(LIBWEBMA) $(LIBWEBMSO) $(EXES) $(DEPS) Makefile.bak + +ifneq ($(MAKECMDGOALS), clean) + -include $(DEPS) +endif