ref: 0de534b725ea95009ee3b54326ca41589ac4e102
parent: f9a5b96fd26903560522c1f114ad5a097f58ba30
parent: 556ff27e2e7ee34f1864da26ff6623a5e30580f7
author: Tom Finegan <tomfinegan@google.com>
date: Thu May 14 16:47:42 EDT 2015
Merge "Remove BUILD_LIBVPX_SO variable from the build system."
--- a/libs.mk
+++ b/libs.mk
@@ -223,9 +223,6 @@
LIBS-$(if yes,$(CONFIG_STATIC)) += $(BUILD_PFX)libvpx.a $(BUILD_PFX)libvpx_g.a
$(BUILD_PFX)libvpx_g.a: $(LIBVPX_OBJS)
-
-BUILD_LIBVPX_SO := $(if yes,$(CONFIG_SHARED))
-
SO_VERSION_MAJOR := 2
SO_VERSION_MINOR := 0
SO_VERSION_PATCH := 0
@@ -242,7 +239,7 @@
libvpx.so.$(SO_VERSION_MAJOR).$(SO_VERSION_MINOR))
endif
-LIBS-$(BUILD_LIBVPX_SO) += $(BUILD_PFX)$(LIBVPX_SO)\
+LIBS-$(CONFIG_SHARED) += $(BUILD_PFX)$(LIBVPX_SO)\
$(notdir $(LIBVPX_SO_SYMLINKS))
$(BUILD_PFX)$(LIBVPX_SO): $(LIBVPX_OBJS) $(EXPORT_FILE)
$(BUILD_PFX)$(LIBVPX_SO): extralibs += -lm
@@ -276,8 +273,8 @@
$(LIBVPX_SO)))
-INSTALL-LIBS-$(BUILD_LIBVPX_SO) += $(LIBVPX_SO_SYMLINKS)
-INSTALL-LIBS-$(BUILD_LIBVPX_SO) += $(LIBSUBDIR)/$(LIBVPX_SO)
+INSTALL-LIBS-$(CONFIG_SHARED) += $(LIBVPX_SO_SYMLINKS)
+INSTALL-LIBS-$(CONFIG_SHARED) += $(LIBSUBDIR)/$(LIBVPX_SO)
LIBS-yes += vpx.pc