From: Andreas Öman <andreas@lonelycoder.com>
Date: Tue, 10 Apr 2012 18:15:48 +0000 (+0200)
Subject: build: Don't use OBJDIR, instead mkdir in each recipe
X-Git-Tag: 3.0~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e226ec3ed789bba8f492844b602a6340512d0cc3;p=thirdparty%2Ftvheadend.git

build: Don't use OBJDIR, instead mkdir in each recipe
---

diff --git a/Makefile b/Makefile
index a5136ac00..a0dacf291 100644
--- a/Makefile
+++ b/Makefile
@@ -142,13 +142,11 @@ SLIBS += $(SLIBS-yes)
 OBJS=    $(SRCS:%.c=$(BUILDDIR)/%.o)
 OBJS_EXTRA = $(SRCS_EXTRA:%.c=$(BUILDDIR)/%.so)
 DEPS=    ${OBJS:%.o=%.d}
-OBJDIRS= $(sort $(dir $(OBJS))) $(sort $(dir $(OBJS_EXTRA)))
 
 # File bundles
 BUNDLE_SRCS=$(BUNDLES:%=$(BUILDDIR)/bundles/%.c)
 BUNDLE_DEPS=$(BUNDLE_SRCS:%.c=%.d)
 BUNDLE_OBJS=$(BUNDLE_SRCS:%.c=%.o)
-OBJDIRS+= $(sort $(dir $(BUNDLE_OBJS)))
 .PRECIOUS: ${BUNDLE_SRCS}
 
 
@@ -172,16 +170,16 @@ all: ${PROG}
 
 .PHONY:	clean distclean
 
-${PROG}: $(OBJDIRS) $(OBJS) $(BUNDLE_OBJS) ${OBJS_EXTRA} Makefile
+${PROG}: $(OBJS) $(BUNDLE_OBJS) ${OBJS_EXTRA} Makefile
+	@mkdir -p $(dir $@)
 	$(CC) -o $@ $(OBJS) $(BUNDLE_OBJS) $(LDFLAGS) ${LDFLAGS_cfg}
 
-$(OBJDIRS):
-	@mkdir -p $@
-
 ${BUILDDIR}/%.o: %.c
+	@mkdir -p $(dir $@)
 	$(CC) -MD -MP $(CFLAGS_com) $(CFLAGS) $(CFLAGS_cfg) -c -o $@ $(CURDIR)/$<
 
 ${BUILDDIR}/%.so: ${SRCS_EXTRA}
+	@mkdir -p $(dir $@)
 	${CC} -O -fbuiltin -fomit-frame-pointer -fPIC -shared -o $@ $< -ldl
 
 clean:
@@ -206,7 +204,9 @@ include support/${OSENV}.mk
 
 # Bundle files
 $(BUILDDIR)/bundles/%.o: $(BUILDDIR)/bundles/%.c
+	@mkdir -p $(dir $@)
 	$(CC) -I${CURDIR}/src -c -o $@ $<
 
 $(BUILDDIR)/bundles/%.c: %
+	@mkdir -p $(dir $@)
 	$(MKBUNDLE) -o $@ -s $< -d ${BUILDDIR}/bundles/$<.d -p $< -z