diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-03-25 00:05:04 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-03-25 00:05:04 -0400 |
| commit | b8a78cfa49d27a1f71e77430ff10d833446fe496 (patch) | |
| tree | 9e5bc8c8f84e1ed6f9cf6f57c6d6d0135198cf59 /build/make/Makefile | |
| parent | 3f4291e6e0a15ae043165c4f1e787d916bb4527d (diff) | |
| parent | beaafefcf166950aed700a63f5d40f8b87cc736a (diff) | |
| download | libvpx-b8a78cfa49d27a1f71e77430ff10d833446fe496.tar libvpx-b8a78cfa49d27a1f71e77430ff10d833446fe496.tar.gz libvpx-b8a78cfa49d27a1f71e77430ff10d833446fe496.tar.bz2 libvpx-b8a78cfa49d27a1f71e77430ff10d833446fe496.zip | |
Merge remote branch 'origin/master' into experimental
Change-Id: Ibffdedc3bd2e1ec349e79ba038b065c98db77d06
Diffstat (limited to 'build/make/Makefile')
| -rwxr-xr-x | build/make/Makefile | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/build/make/Makefile b/build/make/Makefile index 5c90463be..64d3c934b 100755 --- a/build/make/Makefile +++ b/build/make/Makefile @@ -331,11 +331,8 @@ ifneq ($(call enabled,DIST-SRCS),) DIST-SRCS-$(CONFIG_MSVS) += build/make/gen_msvs_sln.sh DIST-SRCS-$(CONFIG_MSVS) += build/x86-msvs/yasm.rules DIST-SRCS-$(CONFIG_RVCT) += build/make/armlink_adapter.sh - # - # This isn't really ARCH_ARM dependent, it's dependent on whether we're - # using assembly code or not (CONFIG_OPTIMIZATIONS maybe). Just use - # this for now. - DIST-SRCS-$(ARCH_ARM) += build/make/obj_int_extract.c + # Include obj_int_extract if we use offsets from asm_*_offsets + DIST-SRCS-$(ARCH_ARM)$(ARCH_X86)$(ARCH_X86_64) += build/make/obj_int_extract.c DIST-SRCS-$(ARCH_ARM) += build/make/ads2gas.pl DIST-SRCS-yes += $(target:-$(TOOLCHAIN)=).mk endif |