Skip to content

Commit

Permalink
checkheaders: Fix directory creation in out-of-tree builds.
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
jamrial authored and beastd committed Aug 7, 2012
1 parent bc773d0 commit 7c5466d
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions common.mak
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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
Expand Down

0 comments on commit 7c5466d

Please sign in to comment.