diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-01-25 13:35:19 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-01-25 15:04:28 +0100 |
| commit | 07a873a27775d6004536bff1186c26c6e52c2b50 (patch) | |
| tree | a19348b9ae29c6c35bd12369e00b61fa7fdacd41 | |
| parent | 366ac22ea5a8bab63c7f46cdad2ddb2ff22cdbed (diff) | |
| download | android_external_ffmpeg-07a873a27775d6004536bff1186c26c6e52c2b50.tar.gz android_external_ffmpeg-07a873a27775d6004536bff1186c26c6e52c2b50.tar.bz2 android_external_ffmpeg-07a873a27775d6004536bff1186c26c6e52c2b50.zip | |
build: Automatically include architecture-specific library Makefile snippets.
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | libavcodec/Makefile | 2 | ||||
| -rw-r--r-- | libavfilter/Makefile | 2 |
3 files changed, 1 insertions, 4 deletions
@@ -112,6 +112,7 @@ define DOSUBDIR $(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V)))) SUBDIR := $(1)/ include $(SRC_PATH)/$(1)/Makefile +-include $(SRC_PATH)/$(1)/$(ARCH)/Makefile include $(SRC_PATH)/library.mak endef diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 620c99e980..fbb8112eea 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -670,8 +670,6 @@ OBJS-$(CONFIG_MLIB) += mlib/dsputil_mlib.o \ # well. OBJS-$(!CONFIG_SMALL) += inverse.o --include $(SRC_PATH)/$(SUBDIR)$(ARCH)/Makefile - SKIPHEADERS += %_tablegen.h \ %_tables.h \ aac_tablegen_decl.h \ diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 09865c148d..8af152da22 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -69,8 +69,6 @@ OBJS-$(CONFIG_TESTSRC_FILTER) += vsrc_testsrc.o OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o --include $(SRC_PATH)/$(SUBDIR)$(ARCH)/Makefile - DIRS = x86 TOOLS = graph2dot lavfi-showfiltfmts |