summaryrefslogtreecommitdiff
path: root/common.mak
diff options
context:
space:
mode:
authorjamal <jamrial@gmail.com>2012-07-15 17:30:40 -0300
committerAlexander Strasser <eclipse7@gmx.net>2012-08-07 22:34:10 +0200
commit7c5466d4fc2e198ba2cac9d5b1d076613fd0b120 (patch)
tree2b234c0048fa1075546a0affc538c548711f9b93 /common.mak
parentbc773d0d422f6eb541b44d4c021831e804e103f7 (diff)
downloadffmpeg-7c5466d4fc2e198ba2cac9d5b1d076613fd0b120.tar.gz
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 <eclipse7@gmx.net>
Diffstat (limited to 'common.mak')
-rw-r--r--common.mak14
1 files 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