RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

license/copyright change - use consistent library names 

Originally committed as revision 584 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Fabrice Bellard 2002-05-25 22:22:57 +00:00
parent 23642d8e54
commit a1b63811c3
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Makefile
View File

@ -1,5 +1,6 @@
#
# Main ffmpeg Makefile # Main ffmpeg Makefile
# (c) 2000, 2001, 2002 Gerard Lantau # (c) 2000, 2001, 2002 Fabrice Bellard
# #
include config.mak include config.mak
@ -20,12 +21,11 @@ EXT=
PROG=ffmpeg ffplay ffserver PROG=ffmpeg ffplay ffserver
endif endif
ifeq ($(BUILD_SHARED),yes) ifeq ($(BUILD_SHARED),yes)
FFMPEG_LIB=-Llibavcodec -lffmpeg DEP_LIBS=libavcodec/libavcodec.so libav/libavformat.a
DEP_FFMPEG_LIB=
else else
FFMPEG_LIB=libavcodec/libavcodec.a DEP_LIBS=libavcodec/libavcodec.a libav/libavformat.a
DEP_FFMPEG_LIB=libavcodec/libavcodec.a
ifeq ($(CONFIG_MP3LAME),yes) ifeq ($(CONFIG_MP3LAME),yes)
EXTRALIBS+=-lmp3lame EXTRALIBS+=-lmp3lame
endif endif
@ -40,11 +40,13 @@ lib:
$(MAKE) -C libavcodec all $(MAKE) -C libavcodec all
$(MAKE) -C libav all $(MAKE) -C libav all
ffmpeg$(EXE): ffmpeg.o libav/libav.a $(DEP_FFMPEG_LIB) ffmpeg$(EXE): ffmpeg.o $(DEP_LIBS)
$(CC) $(LDFLAGS) -o $@ $^ $(FFMPEG_LIB) $(EXTRALIBS) $(CC) $(LDFLAGS) -o $@ ffmpeg.o -L./libavcodec -L./libav \
-lavformat -lavcodec $(EXTRALIBS)
ffserver$(EXE): ffserver.o libav/libav.a $(DEP_FFMPEG_LIB) ffserver$(EXE): ffserver.o $(DEP_LIBS)
$(CC) $(LDFLAGS) -o $@ $^ $(FFMPEG_LIB) $(EXTRALIBS) $(CC) $(LDFLAGS) -o $@ ffserver.o -L./libavcodec -L./libav \
-lavformat -lavcodec $(EXTRALIBS)
ffplay: ffmpeg$(EXE) ffplay: ffmpeg$(EXE)
ln -sf $< $@ ln -sf $< $@