Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
external
ffmpeg
Commits
76ca42a8
Commit
76ca42a8
authored
Apr 09, 2008
by
Måns Rullgård
Browse files
move DEP_LIBS to common.mak
Originally committed as revision 12777 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
8a03404d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
5 deletions
+3
-5
Makefile
Makefile
+0
-3
common.mak
common.mak
+2
-0
subdir.mak
subdir.mak
+1
-2
No files found.
Makefile
View file @
76ca42a8
...
...
@@ -33,9 +33,6 @@ include common.mak
FF_LDFLAGS
:=
$(FFLDFLAGS)
FF_EXTRALIBS
:=
$(FFEXTRALIBS)
S
:=
$(BUILD_SHARED:yes=S)
DEP_LIBS
:=
$(
foreach
NAME,
$(FFLIBS)
,lib
$(NAME)
/
$
(
$(S)
LIBNAME
))
ALL_TARGETS-$(CONFIG_VHOOK)
+=
videohook
ALL_TARGETS-$(BUILD_DOC)
+=
documentation
...
...
common.mak
View file @
76ca42a8
...
...
@@ -57,6 +57,8 @@ SRCS := $(addprefix $(SUBDIR),$(SRCS))
OBJS
:=
$(
addprefix
$(SUBDIR)
,
$(OBJS)
)
TESTS
:=
$(
addprefix
$(SUBDIR)
,
$(TESTS)
)
DEP_LIBS
:=
$(
foreach
NAME,
$(FFLIBS)
,lib
$(NAME)
/
$
(
$(BUILD_SHARED:yes=S)
LIBNAME
))
ALLHEADERS
:=
$(
subst
$(SRC_DIR)
/,
$(SUBDIR)
,
$(
wildcard
$(SRC_DIR)
/
*
.h
))
checkheaders
:
$(filter-out %_template.ho
,
$(ALLHEADERS:.h=.ho))
...
...
subdir.mak
View file @
76ca42a8
...
...
@@ -33,8 +33,7 @@ $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS)
$(SLIB_EXTRA_CMD)
ifdef
SUBDIR
$(SUBDIR)$(SLIBNAME_WITH_MAJOR)
:
\
$(foreach NAME
,
$(FFLIBS)
,
lib$(NAME)/$(SLIBNAME))
$(SUBDIR)$(SLIBNAME_WITH_MAJOR)
:
$(DEP_LIBS)
endif
endif
...
...
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