diff options
| author | Mans Rullgard <mans@mansr.com> | 2011-12-13 13:28:01 +0000 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-12-13 14:26:49 +0000 |
| commit | 878dda5db12b6f84cc9fb37c5c88b94a5be61a24 (patch) | |
| tree | 6fe78f20f6829d72b834332c49dbfcb439d05da8 | |
| parent | 4722a03c75d17d88312b91cd1006776844237349 (diff) | |
| download | ffmpeg-878dda5db12b6f84cc9fb37c5c88b94a5be61a24.tar.gz | |
build: move inclusion of subdir.mak to main subdir loop
Signed-off-by: Mans Rullgard <mans@mansr.com>
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | libavcodec/Makefile | 2 | ||||
| -rw-r--r-- | libavdevice/Makefile | 2 | ||||
| -rw-r--r-- | libavfilter/Makefile | 2 | ||||
| -rw-r--r-- | libavformat/Makefile | 2 | ||||
| -rw-r--r-- | libavutil/Makefile | 2 | ||||
| -rw-r--r-- | libpostproc/Makefile | 2 | ||||
| -rw-r--r-- | libswscale/Makefile | 2 |
8 files changed, 1 insertions, 14 deletions
@@ -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)))) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 383039ac26..07a3048535 100644 --- a/libavcodec/Makefile +++ b/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 diff --git a/libavdevice/Makefile b/libavdevice/Makefile index 78de08a50e..1a1e2f129d 100644 --- a/libavdevice/Makefile +++ b/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 diff --git a/libavfilter/Makefile b/libavfilter/Makefile index bc05f1ddea..63974d0089 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -74,5 +74,3 @@ OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o DIRS = x86 TOOLS = graph2dot lavfi-showfiltfmts - -include $(SRC_PATH)/subdir.mak diff --git a/libavformat/Makefile b/libavformat/Makefile index 9d2e946b3c..ea28290da8 100644 --- a/libavformat/Makefile +++ b/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 diff --git a/libavutil/Makefile b/libavutil/Makefile index bded2c63c5..6896846081 100644 --- a/libavutil/Makefile +++ b/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 diff --git a/libpostproc/Makefile b/libpostproc/Makefile index 11de3d3235..86c9b5f47d 100644 --- a/libpostproc/Makefile +++ b/libpostproc/Makefile @@ -4,5 +4,3 @@ FFLIBS = avutil HEADERS = postprocess.h OBJS = postprocess.o - -include $(SRC_PATH)/subdir.mak diff --git a/libswscale/Makefile b/libswscale/Makefile index 5671b2e1b3..bb9b7d3539 100644 --- a/libswscale/Makefile +++ b/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 |