Commit 878dda5d authored by Mans Rullgard's avatar Mans Rullgard
Browse files

build: move inclusion of subdir.mak to main subdir loop


Signed-off-by: default avatarMans Rullgard <mans@mansr.com>
parent 4722a03c
...@@ -113,6 +113,7 @@ define DOSUBDIR ...@@ -113,6 +113,7 @@ define DOSUBDIR
$(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V)))) $(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V))))
SUBDIR := $(1)/ SUBDIR := $(1)/
include $(SRC_PATH)/$(1)/Makefile include $(SRC_PATH)/$(1)/Makefile
include $(SRC_PATH)/subdir.mak
endef endef
$(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D)))) $(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))
......
...@@ -694,8 +694,6 @@ DIRS = alpha arm bfin mlib ppc ps2 sh4 sparc x86 ...@@ -694,8 +694,6 @@ DIRS = alpha arm bfin mlib ppc ps2 sh4 sparc x86
CLEANFILES = *_tables.c *_tables.h *_tablegen$(HOSTEXESUF) CLEANFILES = *_tables.c *_tables.h *_tablegen$(HOSTEXESUF)
include $(SRC_PATH)/subdir.mak
$(SUBDIR)dct-test$(EXESUF): $(SUBDIR)dctref.o $(SUBDIR)dct-test$(EXESUF): $(SUBDIR)dctref.o
TRIG_TABLES = cos cos_fixed sin TRIG_TABLES = cos cos_fixed sin
......
...@@ -32,5 +32,3 @@ SKIPHEADERS-$(HAVE_ALSA_ASOUNDLIB_H) += alsa-audio.h ...@@ -32,5 +32,3 @@ SKIPHEADERS-$(HAVE_ALSA_ASOUNDLIB_H) += alsa-audio.h
SKIPHEADERS-$(HAVE_SNDIO_H) += sndio_common.h SKIPHEADERS-$(HAVE_SNDIO_H) += sndio_common.h
TESTPROGS = timefilter TESTPROGS = timefilter
include $(SRC_PATH)/subdir.mak
...@@ -74,5 +74,3 @@ OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o ...@@ -74,5 +74,3 @@ OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o
DIRS = x86 DIRS = x86
TOOLS = graph2dot lavfi-showfiltfmts TOOLS = graph2dot lavfi-showfiltfmts
include $(SRC_PATH)/subdir.mak
...@@ -348,6 +348,4 @@ EXAMPLES = metadata output ...@@ -348,6 +348,4 @@ EXAMPLES = metadata output
TESTPROGS = seek TESTPROGS = seek
TOOLS = pktdumper probetest TOOLS = pktdumper probetest
include $(SRC_PATH)/subdir.mak
$(SUBDIR)output-example$(EXESUF): ELIBS = -lswscale $(SUBDIR)output-example$(EXESUF): ELIBS = -lswscale
...@@ -83,6 +83,4 @@ DIRS = arm bfin sh4 x86 ...@@ -83,6 +83,4 @@ DIRS = arm bfin sh4 x86
ARCH_HEADERS = bswap.h intmath.h intreadwrite.h timer.h ARCH_HEADERS = bswap.h intmath.h intreadwrite.h timer.h
include $(SRC_PATH)/subdir.mak
$(SUBDIR)lzo-test$(EXESUF): ELIBS = -llzo2 $(SUBDIR)lzo-test$(EXESUF): ELIBS = -llzo2
...@@ -4,5 +4,3 @@ FFLIBS = avutil ...@@ -4,5 +4,3 @@ FFLIBS = avutil
HEADERS = postprocess.h HEADERS = postprocess.h
OBJS = postprocess.o OBJS = postprocess.o
include $(SRC_PATH)/subdir.mak
...@@ -22,5 +22,3 @@ OBJS-$(HAVE_YASM) += x86/scale.o ...@@ -22,5 +22,3 @@ OBJS-$(HAVE_YASM) += x86/scale.o
TESTPROGS = colorspace swscale TESTPROGS = colorspace swscale
DIRS = bfin mlib ppc sparc x86 DIRS = bfin mlib ppc sparc x86
include $(SRC_PATH)/subdir.mak
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment