From 3fdcb8ccdc2cf5668e02134a815e5a7acc39f763 Mon Sep 17 00:00:00 2001 From: Christophe Gisquet Date: Wed, 18 Feb 2015 10:51:17 +0100 Subject: [PATCH] Makefile: improve DBG option for asm This improves the cleanup, dependency generation and DBG command issuing. Signed-off-by: Michael Niedermayer --- common.mak | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/common.mak b/common.mak index a6fabb300a..20b7fa3103 100644 --- a/common.mak +++ b/common.mak @@ -7,10 +7,10 @@ all: all-yes DEFAULT_YASMD=.dbg -ifndef DBG -YASMD= -else +ifeq (1, DBG) YASMD=$(DEFAULT_YASMD) +else +YASMD= endif ifndef SUBDIR @@ -152,11 +152,11 @@ LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a define RULES clean:: - $(RM) $(OBJS) $(OBJS:.o=.d) + $(RM) $(OBJS) $(OBJS:.o=.d) $(OBJS:.o=$(DEFAULT_YASMD).d) $(RM) $(HOSTPROGS) $(RM) $(TOOLS) endef $(eval $(RULES)) --include $(wildcard $(OBJS:.o=.d) $(HOSTOBJS:.o=.d) $(TESTOBJS:.o=.d) $(HOBJS:.o=.d) $(SLIBOBJS:.o=.d)) +-include $(wildcard $(OBJS:.o=.d) $(HOSTOBJS:.o=.d) $(TESTOBJS:.o=.d) $(HOBJS:.o=.d) $(SLIBOBJS:.o=.d)) $(OBJS:.o=$(DEFAULT_YASMD).d)