Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
0de534b7
Commit
0de534b7
authored
May 14, 2015
by
Tom Finegan
Committed by
Gerrit Code Review
May 14, 2015
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Remove BUILD_LIBVPX_SO variable from the build system."
parents
f9a5b96f
556ff27e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
6 deletions
+3
-6
libs.mk
libs.mk
+3
-6
No files found.
libs.mk
View file @
0de534b7
...
...
@@ -223,9 +223,6 @@ OBJS-yes += $(LIBVPX_OBJS)
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_SYMLINKS := $(addprefix $(LIBSUBDIR)/, \
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 @@ $(eval $(call libvpx_symlink_template,\
$(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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment