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
c7f1a2f5
Commit
c7f1a2f5
authored
18 years ago
by
Diego Biurrun
Browse files
Options
Downloads
Patches
Plain Diff
Unconditionally clean AMR subdirs.
Originally committed as revision 5344 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
c787ba85
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
libavcodec/Makefile
+2
-11
2 additions, 11 deletions
libavcodec/Makefile
with
2 additions
and
11 deletions
libavcodec/Makefile
+
2
−
11
View file @
c7f1a2f5
...
@@ -240,14 +240,12 @@ AMROBJS=
...
@@ -240,14 +240,12 @@ AMROBJS=
ifeq
($(AMR_NB),yes)
ifeq
($(AMR_NB),yes)
AMROBJS
=
amr.o
AMROBJS
=
amr.o
OBJS
+=
amr_float/sp_dec.o amr_float/sp_enc.o amr_float/interf_dec.o amr_float/interf_enc.o
OBJS
+=
amr_float/sp_dec.o amr_float/sp_enc.o amr_float/interf_dec.o amr_float/interf_enc.o
CLEANAMR
=
cleanamrfloat
endif
endif
ifeq
($(AMR_NB_FIXED),yes)
ifeq
($(AMR_NB_FIXED),yes)
AMROBJS
=
amr.o
AMROBJS
=
amr.o
EXTRAOBJS
+=
amr/
*
.o
EXTRAOBJS
+=
amr/
*
.o
EXTRADEPS
=
amrlibs
EXTRADEPS
=
amrlibs
CLEANAMR
=
cleanamr
endif
endif
ifeq
($(AMR_WB),yes)
ifeq
($(AMR_WB),yes)
...
@@ -258,7 +256,6 @@ OBJS+= amrwb_float/dec_acelp.o amrwb_float/dec_dtx.o amrwb_float/dec_gain.o \
...
@@ -258,7 +256,6 @@ OBJS+= amrwb_float/dec_acelp.o amrwb_float/dec_dtx.o amrwb_float/dec_gain.o \
amrwb_float/enc_dtx.o amrwb_float/enc_gain.o amrwb_float/enc_if.o
\
amrwb_float/enc_dtx.o amrwb_float/enc_gain.o amrwb_float/enc_if.o
\
amrwb_float/enc_lpc.o amrwb_float/enc_main.o amrwb_float/enc_rom.o
\
amrwb_float/enc_lpc.o amrwb_float/enc_main.o amrwb_float/enc_rom.o
\
amrwb_float/enc_util.o amrwb_float/if_rom.o
amrwb_float/enc_util.o amrwb_float/if_rom.o
CLEANAMR
=
cleanamrwbfloat
endif
endif
OBJS
+=
$(
AMROBJS
)
OBJS
+=
$(
AMROBJS
)
...
@@ -432,7 +429,7 @@ tests: apiexample cpuid_test $(TESTS)
...
@@ -432,7 +429,7 @@ tests: apiexample cpuid_test $(TESTS)
dsputil.o
:
dsputil.c dsputil.h
dsputil.o
:
dsputil.c dsputil.h
clean
::
$(CLEANAMR)
clean
::
rm
-f
\
rm
-f
\
i386/
*
.o i386/
*
~
\
i386/
*
.o i386/
*
~
\
armv4l/
*
.o armv4l/
*
~
\
armv4l/
*
.o armv4l/
*
~
\
...
@@ -443,15 +440,9 @@ clean:: $(CLEANAMR)
...
@@ -443,15 +440,9 @@ clean:: $(CLEANAMR)
sh4/
*
.o sh4/
*
~
\
sh4/
*
.o sh4/
*
~
\
sparc/
*
.o sparc/
*
~
\
sparc/
*
.o sparc/
*
~
\
liba52/
*
.o liba52/
*
~
\
liba52/
*
.o liba52/
*
~
\
amr_float/
*
.o
\
apiexample
$(
TESTS
)
apiexample
$(
TESTS
)
cleanamr
:
$(
MAKE
)
-C
amr clean
$(
MAKE
)
-C
amr clean
cleanamrfloat
:
rm
-f
amr_float/
*
.o
cleanamrwbfloat
:
$(
MAKE
)
-C
amrwb_float
-f
makefile.gcc clean
$(
MAKE
)
-C
amrwb_float
-f
makefile.gcc clean
# api example program
# api example program
...
...
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