From 7c5466d4fc2e198ba2cac9d5b1d076613fd0b120 Mon Sep 17 00:00:00 2001 From: jamal Date: Sun, 15 Jul 2012 17:30:40 -0300 Subject: checkheaders: Fix directory creation in out-of-tree builds. checkheaders wasn't creating folders as needed, so if it was run immediately after the configure script it would fail as soon as it tried to compile headers inside the ARCH folders. Signed-off-by: Alexander Strasser --- common.mak | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/common.mak b/common.mak index eed8f08c6d..ec706480d0 100644 --- a/common.mak +++ b/common.mak @@ -97,7 +97,8 @@ DEP_LIBS := $(foreach NAME,$(FFLIBS),lib$(NAME)/$($(CONFIG_SHARED:yes=S)LIBNAME) ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h $(SRC_DIR)/$(ARCH)/*.h)) SKIPHEADERS += $(ARCH_HEADERS:%=$(ARCH)/%) $(SKIPHEADERS-) SKIPHEADERS := $(SKIPHEADERS:%=$(SUBDIR)%) -checkheaders: $(filter-out $(SKIPHEADERS:.h=.ho),$(ALLHEADERS:.h=.ho)) +HEADEROBJS := $(filter-out $(SKIPHEADERS:.h=.ho),$(ALLHEADERS:.h=.ho)) +checkheaders: $(HEADEROBJS) alltools: $(TOOLS) @@ -107,12 +108,13 @@ $(HOSTOBJS): %.o: %.c $(HOSTPROGS): %$(HOSTEXESUF): %.o $(HOSTCC) $(HOSTLDFLAGS) -o $@ $< $(HOSTLIBS) -$(OBJS): | $(sort $(dir $(OBJS))) -$(HOSTOBJS): | $(sort $(dir $(HOSTOBJS))) -$(TESTOBJS): | $(sort $(dir $(TESTOBJS))) -$(TOOLOBJS): | tools +$(OBJS): | $(sort $(dir $(OBJS))) +$(HOSTOBJS): | $(sort $(dir $(HOSTOBJS))) +$(TESTOBJS): | $(sort $(dir $(TESTOBJS))) +$(HEADEROBJS): | $(sort $(dir $(HEADEROBJS))) +$(TOOLOBJS): | tools -OBJDIRS := $(OBJDIRS) $(dir $(OBJS) $(HOSTOBJS) $(TESTOBJS)) +OBJDIRS := $(OBJDIRS) $(dir $(OBJS) $(HOSTOBJS) $(TESTOBJS) $(HEADEROBJS)) CLEANSUFFIXES = *.d *.o *~ *.ho *.map *.ver *.gcno *.gcda DISTCLEANSUFFIXES = *.pc -- cgit v1.2.1