Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
76ca42a8
Commit
76ca42a8
authored
17 years ago
by
Måns Rullgård
Browse files
Options
Downloads
Patches
Plain Diff
move DEP_LIBS to common.mak
Originally committed as revision 12777 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
8a03404d
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Makefile
+0
-3
0 additions, 3 deletions
Makefile
common.mak
+2
-0
2 additions, 0 deletions
common.mak
subdir.mak
+1
-2
1 addition, 2 deletions
subdir.mak
with
3 additions
and
5 deletions
Makefile
+
0
−
3
View file @
76ca42a8
...
@@ -33,9 +33,6 @@ include common.mak
...
@@ -33,9 +33,6 @@ include common.mak
FF_LDFLAGS
:=
$(
FFLDFLAGS
)
FF_LDFLAGS
:=
$(
FFLDFLAGS
)
FF_EXTRALIBS
:=
$(
FFEXTRALIBS
)
FF_EXTRALIBS
:=
$(
FFEXTRALIBS
)
S
:=
$(
BUILD_SHARED:yes
=
S
)
DEP_LIBS
:=
$(
foreach NAME,
$(
FFLIBS
)
,lib
$(
NAME
)
/
$($(
S
)
LIBNAME
))
ALL_TARGETS-$(CONFIG_VHOOK)
+=
videohook
ALL_TARGETS-$(CONFIG_VHOOK)
+=
videohook
ALL_TARGETS-$(BUILD_DOC)
+=
documentation
ALL_TARGETS-$(BUILD_DOC)
+=
documentation
...
...
This diff is collapsed.
Click to expand it.
common.mak
+
2
−
0
View file @
76ca42a8
...
@@ -57,6 +57,8 @@ SRCS := $(addprefix $(SUBDIR),$(SRCS))
...
@@ -57,6 +57,8 @@ SRCS := $(addprefix $(SUBDIR),$(SRCS))
OBJS
:=
$(
addprefix
$(
SUBDIR
)
,
$(
OBJS
))
OBJS
:=
$(
addprefix
$(
SUBDIR
)
,
$(
OBJS
))
TESTS
:=
$(
addprefix
$(
SUBDIR
)
,
$(
TESTS
))
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
))
ALLHEADERS
:=
$(
subst
$(
SRC_DIR
)
/,
$(
SUBDIR
)
,
$(
wildcard
$(
SRC_DIR
)
/
*
.h
))
checkheaders
:
$(filter-out %_template.ho
,
$(ALLHEADERS:.h=.ho))
checkheaders
:
$(filter-out %_template.ho
,
$(ALLHEADERS:.h=.ho))
...
...
This diff is collapsed.
Click to expand it.
subdir.mak
+
1
−
2
View file @
76ca42a8
...
@@ -33,8 +33,7 @@ $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS)
...
@@ -33,8 +33,7 @@ $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS)
$(
SLIB_EXTRA_CMD
)
$(
SLIB_EXTRA_CMD
)
ifdef
SUBDIR
ifdef
SUBDIR
$(SUBDIR)$(SLIBNAME_WITH_MAJOR)
:
\
$(SUBDIR)$(SLIBNAME_WITH_MAJOR)
:
$(DEP_LIBS)
$(foreach NAME
,
$(FFLIBS)
,
lib$(NAME)/$(SLIBNAME))
endif
endif
endif
endif
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment