--- libvpx-v1.1.0-orig/examples.mk	2012-06-30 15:22:18.584183758 -0700
+++ libvpx-v1.1.0-orig/examples.mk	2012-06-30 16:17:43.666192410 -0700
@@ -178,7 +178,7 @@ 
 
 
 # Instantiate linker template for all examples.
-CODEC_LIB=$(if $(CONFIG_DEBUG_LIBS),vpx_g,vpx)
+CODEC_LIB=$(if $(CONFIG_DEBUG_LIBS && !CONFIG_SHARED),vpx_g,vpx)
 CODEC_LIB_SUF=$(if $(CONFIG_SHARED),.so,.a)
 $(foreach bin,$(BINS-yes),\
     $(if $(BUILD_OBJS),$(eval $(bin):\
--- libvpx-v1.1.0-orig/libs.mk	2012-06-30 15:22:18.585183749 -0700
+++ libvpx-v1.1.0-orig/libs.mk	2012-06-30 16:17:13.069192334 -0700
@@ -125,7 +125,7 @@ 
 endif
 else
 INSTALL-LIBS-$(CONFIG_STATIC) += $(LIBSUBDIR)/libvpx.a
-INSTALL-LIBS-$(CONFIG_DEBUG_LIBS) += $(LIBSUBDIR)/libvpx_g.a
+INSTALL-LIBS-$(if $(CONFIG_DEBUG_LIBS),$(CONFIG_STATIC)) += $(LIBSUBDIR)/libvpx_g.a
 endif
 
 CODEC_SRCS=$(filter-out %_test.cc,$(call enabled,CODEC_SRCS))