Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

Signed-off-by: Mans Rullgard <mans@mansr.com>
  • Loading branch information...
commit 878dda5db12b6f84cc9fb37c5c88b94a5be61a24 1 parent 4722a03
@mansr mansr authored
View
1  Makefile
@@ -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
2  libavcodec/Makefile
@@ -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
View
2  libavdevice/Makefile
@@ -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
View
2  libavfilter/Makefile
@@ -74,5 +74,3 @@ OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o
DIRS = x86
TOOLS = graph2dot lavfi-showfiltfmts
-
-include $(SRC_PATH)/subdir.mak
View
2  libavformat/Makefile
@@ -348,6 +348,4 @@ EXAMPLES = metadata output
TESTPROGS = seek
TOOLS = pktdumper probetest
-include $(SRC_PATH)/subdir.mak
-
$(SUBDIR)output-example$(EXESUF): ELIBS = -lswscale
View
2  libavutil/Makefile
@@ -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
View
2  libpostproc/Makefile
@@ -4,5 +4,3 @@ FFLIBS = avutil
HEADERS = postprocess.h
OBJS = postprocess.o
-
-include $(SRC_PATH)/subdir.mak
View
2  libswscale/Makefile
@@ -22,5 +22,3 @@ OBJS-$(HAVE_YASM) += x86/scale.o
TESTPROGS = colorspace swscale
DIRS = bfin mlib ppc sparc x86
-
-include $(SRC_PATH)/subdir.mak
Please sign in to comment.
Something went wrong with that request. Please try again.