commit 06f58c0df7f0f05d6cf8e3e4715f8c4111424640
author John Koleszar <jkoleszar@google.com> Wed Aug 03 09:20:37 2011 -0400
committer John Koleszar <jkoleszar@google.com> Wed Aug 03 10:38:45 2011 -0400
tree 49e11f5c5f764747c2be4f80f76a41329dc16f9a
parent c1bf6ca6cc3bb19379a97c751668f1d5b37b4c5d

Fix building of static libs on universal-darwin

The static libs should not be built from sources during the top level
of a universal build. This regression was introduced in commit
495b241fa6b03345baf2b2f39aa8c06c735fccc2, which made the static
libs selectable under CONFIG_STATIC.

Change-Id: I585167e17459877e0fa7fa19e1046c3703d91c97

libs.mk

diff --git a/libs.mk b/libs.mk
index fed1847..757e068 100644
--- a/libs.mk
+++ b/libs.mk
@@ -180,7 +180,7 @@
 else
 LIBVPX_OBJS=$(call objs,$(CODEC_SRCS))
 OBJS-$(BUILD_LIBVPX) += $(LIBVPX_OBJS)
-LIBS-$(CONFIG_STATIC) += $(BUILD_PFX)libvpx.a $(BUILD_PFX)libvpx_g.a
+LIBS-$(if $(BUILD_LIBVPX),$(CONFIG_STATIC)) += $(BUILD_PFX)libvpx.a $(BUILD_PFX)libvpx_g.a
 $(BUILD_PFX)libvpx_g.a: $(LIBVPX_OBJS)
 
 BUILD_LIBVPX_SO         := $(if $(BUILD_LIBVPX),$(CONFIG_SHARED))