Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(47)

Side by Side Diff: source/libvpx/libs.mk

Issue 1026393002: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « source/libvpx/build/make/Makefile ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 ## 1 ##
2 ## Copyright (c) 2010 The WebM project authors. All Rights Reserved. 2 ## Copyright (c) 2010 The WebM project authors. All Rights Reserved.
3 ## 3 ##
4 ## Use of this source code is governed by a BSD-style license 4 ## Use of this source code is governed by a BSD-style license
5 ## that can be found in the LICENSE file in the root of the source 5 ## that can be found in the LICENSE file in the root of the source
6 ## tree. An additional intellectual property rights grant can be found 6 ## tree. An additional intellectual property rights grant can be found
7 ## in the file PATENTS. All contributing project authors may 7 ## in the file PATENTS. All contributing project authors may
8 ## be found in the AUTHORS file in the root of the source tree. 8 ## be found in the AUTHORS file in the root of the source tree.
9 ## 9 ##
10 10
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 endif 223 endif
224 else 224 else
225 LIBVPX_OBJS=$(call objs,$(CODEC_SRCS)) 225 LIBVPX_OBJS=$(call objs,$(CODEC_SRCS))
226 OBJS-$(BUILD_LIBVPX) += $(LIBVPX_OBJS) 226 OBJS-$(BUILD_LIBVPX) += $(LIBVPX_OBJS)
227 LIBS-$(if $(BUILD_LIBVPX),$(CONFIG_STATIC)) += $(BUILD_PFX)libvpx.a $(BUILD_PFX) libvpx_g.a 227 LIBS-$(if $(BUILD_LIBVPX),$(CONFIG_STATIC)) += $(BUILD_PFX)libvpx.a $(BUILD_PFX) libvpx_g.a
228 $(BUILD_PFX)libvpx_g.a: $(LIBVPX_OBJS) 228 $(BUILD_PFX)libvpx_g.a: $(LIBVPX_OBJS)
229 229
230 230
231 BUILD_LIBVPX_SO := $(if $(BUILD_LIBVPX),$(CONFIG_SHARED)) 231 BUILD_LIBVPX_SO := $(if $(BUILD_LIBVPX),$(CONFIG_SHARED))
232 232
233 SO_VERSION_MAJOR := 2
234 SO_VERSION_MINOR := 0
235 SO_VERSION_PATCH := 0
233 ifeq ($(filter darwin%,$(TGT_OS)),$(TGT_OS)) 236 ifeq ($(filter darwin%,$(TGT_OS)),$(TGT_OS))
234 LIBVPX_SO := libvpx.$(VERSION_MAJOR).dylib 237 LIBVPX_SO := libvpx.$(SO_VERSION_MAJOR).dylib
235 EXPORT_FILE := libvpx.syms 238 EXPORT_FILE := libvpx.syms
236 LIBVPX_SO_SYMLINKS := $(addprefix $(LIBSUBDIR)/, \ 239 LIBVPX_SO_SYMLINKS := $(addprefix $(LIBSUBDIR)/, \
237 libvpx.dylib ) 240 libvpx.dylib )
238 else 241 else
239 LIBVPX_SO := libvpx.so.$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION _PATCH) 242 LIBVPX_SO := libvpx.so.$(SO_VERSION_MAJOR).$(SO_VERSION_MINOR).$(S O_VERSION_PATCH)
240 EXPORT_FILE := libvpx.ver 243 EXPORT_FILE := libvpx.ver
241 SYM_LINK := libvpx.so
242 LIBVPX_SO_SYMLINKS := $(addprefix $(LIBSUBDIR)/, \ 244 LIBVPX_SO_SYMLINKS := $(addprefix $(LIBSUBDIR)/, \
243 libvpx.so libvpx.so.$(VERSION_MAJOR) \ 245 libvpx.so libvpx.so.$(SO_VERSION_MAJOR) \
244 libvpx.so.$(VERSION_MAJOR).$(VERSION_MINOR)) 246 libvpx.so.$(SO_VERSION_MAJOR).$(SO_VERSION_MINOR))
245 endif 247 endif
246 248
247 LIBS-$(BUILD_LIBVPX_SO) += $(BUILD_PFX)$(LIBVPX_SO)\ 249 LIBS-$(BUILD_LIBVPX_SO) += $(BUILD_PFX)$(LIBVPX_SO)\
248 $(notdir $(LIBVPX_SO_SYMLINKS)) 250 $(notdir $(LIBVPX_SO_SYMLINKS))
249 $(BUILD_PFX)$(LIBVPX_SO): $(LIBVPX_OBJS) $(EXPORT_FILE) 251 $(BUILD_PFX)$(LIBVPX_SO): $(LIBVPX_OBJS) $(EXPORT_FILE)
250 $(BUILD_PFX)$(LIBVPX_SO): extralibs += -lm 252 $(BUILD_PFX)$(LIBVPX_SO): extralibs += -lm
251 $(BUILD_PFX)$(LIBVPX_SO): SONAME = libvpx.so.$(VERSION_MAJOR) 253 $(BUILD_PFX)$(LIBVPX_SO): SONAME = libvpx.so.$(SO_VERSION_MAJOR)
252 $(BUILD_PFX)$(LIBVPX_SO): EXPORTS_FILE = $(EXPORT_FILE) 254 $(BUILD_PFX)$(LIBVPX_SO): EXPORTS_FILE = $(EXPORT_FILE)
253 255
254 libvpx.ver: $(call enabled,CODEC_EXPORTS) 256 libvpx.ver: $(call enabled,CODEC_EXPORTS)
255 @echo " [CREATE] $@" 257 @echo " [CREATE] $@"
256 $(qexec)echo "{ global:" > $@ 258 $(qexec)echo "{ global:" > $@
257 $(qexec)for f in $?; do awk '{print $$2";"}' < $$f >>$@; done 259 $(qexec)for f in $?; do awk '{print $$2";"}' < $$f >>$@; done
258 $(qexec)echo "local: *; };" >> $@ 260 $(qexec)echo "local: *; };" >> $@
259 CLEAN-OBJS += libvpx.ver 261 CLEAN-OBJS += libvpx.ver
260 262
261 libvpx.syms: $(call enabled,CODEC_EXPORTS) 263 libvpx.syms: $(call enabled,CODEC_EXPORTS)
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
538 EXAMPLES_BIN_PATH := $(TGT_OS:win64=x64)/Release 540 EXAMPLES_BIN_PATH := $(TGT_OS:win64=x64)/Release
539 endif 541 endif
540 exampletest: examples testdata 542 exampletest: examples testdata
541 $(qexec)$(SRC_PATH_BARE)/test/examples.sh \ 543 $(qexec)$(SRC_PATH_BARE)/test/examples.sh \
542 --test-data-path $(LIBVPX_TEST_DATA_PATH) \ 544 --test-data-path $(LIBVPX_TEST_DATA_PATH) \
543 --bin-path $(EXAMPLES_BIN_PATH) 545 --bin-path $(EXAMPLES_BIN_PATH)
544 else 546 else
545 exampletest: 547 exampletest:
546 @echo Unit tests must be enabled to make the exampletest target. 548 @echo Unit tests must be enabled to make the exampletest target.
547 endif 549 endif
OLDNEW
« no previous file with comments | « source/libvpx/build/make/Makefile ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698