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

diff --git a/Makefile b/Makefile
index a5136ac00e753038d4a11b48da068aabcfd2398c..a0dacf291b14a646ca79c5c029c55902cbed2436 100644 (file)
--- 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