Permalink
Browse files

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

Signed-off-by: Mans Rullgard <mans@mansr.com>
  • Loading branch information...
1 parent 4722a03 commit 878dda5db12b6f84cc9fb37c5c88b94a5be61a24 @mansr mansr committed Dec 13, 2011
Showing with 1 addition and 14 deletions.
  1. +1 −0 Makefile
  2. +0 −2 libavcodec/Makefile
  3. +0 −2 libavdevice/Makefile
  4. +0 −2 libavfilter/Makefile
  5. +0 −2 libavformat/Makefile
  6. +0 −2 libavutil/Makefile
  7. +0 −2 libpostproc/Makefile
  8. +0 −2 libswscale/Makefile
View
@@ -113,6 +113,7 @@ define DOSUBDIR
$(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V))))
SUBDIR := $(1)/
include $(SRC_PATH)/$(1)/Makefile
+include $(SRC_PATH)/subdir.mak
endef
$(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))
View
@@ -694,8 +694,6 @@ DIRS = alpha arm bfin mlib ppc ps2 sh4 sparc x86
CLEANFILES = *_tables.c *_tables.h *_tablegen$(HOSTEXESUF)
-include $(SRC_PATH)/subdir.mak
-
$(SUBDIR)dct-test$(EXESUF): $(SUBDIR)dctref.o
TRIG_TABLES = cos cos_fixed sin
@@ -32,5 +32,3 @@ SKIPHEADERS-$(HAVE_ALSA_ASOUNDLIB_H) += alsa-audio.h
SKIPHEADERS-$(HAVE_SNDIO_H) += sndio_common.h
TESTPROGS = timefilter
-
-include $(SRC_PATH)/subdir.mak
@@ -74,5 +74,3 @@ OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o
DIRS = x86
TOOLS = graph2dot lavfi-showfiltfmts
-
-include $(SRC_PATH)/subdir.mak
@@ -348,6 +348,4 @@ EXAMPLES = metadata output
TESTPROGS = seek
TOOLS = pktdumper probetest
-include $(SRC_PATH)/subdir.mak
-
$(SUBDIR)output-example$(EXESUF): ELIBS = -lswscale
View
@@ -83,6 +83,4 @@ DIRS = arm bfin sh4 x86
ARCH_HEADERS = bswap.h intmath.h intreadwrite.h timer.h
-include $(SRC_PATH)/subdir.mak
-
$(SUBDIR)lzo-test$(EXESUF): ELIBS = -llzo2
@@ -4,5 +4,3 @@ FFLIBS = avutil
HEADERS = postprocess.h
OBJS = postprocess.o
-
-include $(SRC_PATH)/subdir.mak
View
@@ -22,5 +22,3 @@ OBJS-$(HAVE_YASM) += x86/scale.o
TESTPROGS = colorspace swscale
DIRS = bfin mlib ppc sparc x86
-
-include $(SRC_PATH)/subdir.mak

0 comments on commit 878dda5

Please sign in to comment.