Merge "Simplify bsize calculation"

[libvpx] / libs.mk

diff --git a/libs.mk b/libs.mk
index 38b4b11121bdc7dc4af3aca5a6deafe4ae3760b3..e48d55c521067dfdede8cee9471a78d72c7735d5 100644 (file)
--- a/libs.mk
+++ b/libs.mk
@@ -179,7 +179,7 @@ INSTALL-SRCS-$(CONFIG_CODEC_SRCS) += $(call enabled,CODEC_EXPORTS)
 # based build systems.
 libvpx_srcs.txt:
        @echo "    [CREATE] $@"
-       @echo $(CODEC_SRCS) | xargs -n1 echo | sort -u > $@
+       @echo $(CODEC_SRCS) | xargs -n1 echo | LC_ALL=C sort -u > $@
 CLEAN-OBJS += libvpx_srcs.txt
 
 
@@ -356,7 +356,7 @@ libvpx_test_data_url=http://downloads.webmproject.org/test_data/libvpx/$(1)
 
 libvpx_test_srcs.txt:
        @echo "    [CREATE] $@"
-       @echo $(LIBVPX_TEST_SRCS) | xargs -n1 echo | sort -u > $@
+       @echo $(LIBVPX_TEST_SRCS) | xargs -n1 echo | LC_ALL=C sort -u > $@
 CLEAN-OBJS += libvpx_test_srcs.txt
 
 $(LIBVPX_TEST_DATA): $(SRC_PATH_BARE)/test/test-data.sha1
@@ -489,7 +489,11 @@ libs.doxy: $(CODEC_DOC_SRCS)
        @echo "ENABLED_SECTIONS += $(sort $(CODEC_DOC_SECTIONS))" >> $@
 
 ## Generate rtcd.h for all objects
+ifeq ($(CONFIG_DEPENDENCY_TRACKING),yes)
 $(OBJS-yes:.o=.d): $(RTCD)
+else
+$(OBJS-yes): $(RTCD)
+endif
 
 ## Update the global src list
 SRCS += $(CODEC_SRCS) $(LIBVPX_TEST_SRCS) $(GTEST_SRCS)