[FFmpeg-cvslog] build: Automatically include architecture-specific library Makefile snippets.

[Diego Biurrun]

ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Wed Jan 25 13:35:19 2012 +0100| [07a873a27775d6004536bff1186c26c6e52c2b50] | committer: Diego Biurrun

build: Automatically include architecture-specific library Makefile snippets.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=07a873a27775d6004536bff1186c26c6e52c2b50
---

 Makefile             |    1 +
 libavcodec/Makefile  |    2 --
 libavfilter/Makefile |    2 --
 3 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index d1b55ba..c9821b7 100644
--- a/Makefile
+++ b/Makefile
@@ -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 620c99e..fbb8112 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 09865c1..8af152d 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