ref: c97a9fc1460a9bb078b569366020f55643597e30
parent: 3225b893e80627aa95e924ec789468db6c38f82c
parent: 8916fa2c3ef54956b60ded340cb8d974fb0ea709
author: John Koleszar <jkoleszar@google.com>
date: Wed Jun 9 13:52:50 EDT 2010
Merge "Make shared object use extralibs"
--- a/build/make/Makefile
+++ b/build/make/Makefile
@@ -231,7 +231,7 @@
$(qexec)$$(LD) -shared $$(LDFLAGS) \
-Wl,--no-undefined -Wl,-soname,$$(SONAME) \
-Wl,--version-script,$$(SO_VERSION_SCRIPT) -o $$@ \
- $$(filter %.o,$$?)
+ $$(filter %.o,$$?) $$(extralibs)
endef
define lipo_lib_template
--- a/libs.mk
+++ b/libs.mk
@@ -182,7 +182,7 @@
LIBVPX_SO := libvpx.so.$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)
LIBS-$(BUILD_LIBVPX_SO) += $(BUILD_PFX)$(LIBVPX_SO)
$(BUILD_PFX)$(LIBVPX_SO): $(LIBVPX_OBJS) libvpx.ver
-$(BUILD_PFX)$(LIBVPX_SO): LDFLAGS += -lm -pthread
+$(BUILD_PFX)$(LIBVPX_SO): extralibs += -lm -pthread
$(BUILD_PFX)$(LIBVPX_SO): SONAME = libvpx.so.$(VERSION_MAJOR)
$(BUILD_PFX)$(LIBVPX_SO): SO_VERSION_SCRIPT = libvpx.ver
LIBVPX_SO_SYMLINKS := $(addprefix $(LIBSUBDIR)/, \