Revision a1b63811

View differences:

Makefile
1
#
1 2
# Main ffmpeg Makefile
2
# (c) 2000, 2001, 2002 Gerard Lantau
3
# (c) 2000, 2001, 2002 Fabrice Bellard
3 4
#
4 5
include config.mak
5 6

  
......
20 21
PROG=ffmpeg ffplay ffserver
21 22
endif
22 23

  
24

  
23 25
ifeq ($(BUILD_SHARED),yes)
24
FFMPEG_LIB=-Llibavcodec -lffmpeg
25
DEP_FFMPEG_LIB=
26
DEP_LIBS=libavcodec/libavcodec.so libav/libavformat.a
26 27
else
27
FFMPEG_LIB=libavcodec/libavcodec.a
28
DEP_FFMPEG_LIB=libavcodec/libavcodec.a
28
DEP_LIBS=libavcodec/libavcodec.a libav/libavformat.a
29 29
ifeq ($(CONFIG_MP3LAME),yes)
30 30
EXTRALIBS+=-lmp3lame
31 31
endif
......
40 40
	$(MAKE) -C libavcodec all
41 41
	$(MAKE) -C libav all
42 42

  
43
ffmpeg$(EXE): ffmpeg.o libav/libav.a $(DEP_FFMPEG_LIB)
44
	$(CC) $(LDFLAGS) -o $@ $^ $(FFMPEG_LIB) $(EXTRALIBS)
43
ffmpeg$(EXE): ffmpeg.o $(DEP_LIBS)
44
	$(CC) $(LDFLAGS) -o $@ ffmpeg.o -L./libavcodec -L./libav \
45
              -lavformat -lavcodec $(EXTRALIBS)
45 46

  
46
ffserver$(EXE): ffserver.o libav/libav.a $(DEP_FFMPEG_LIB)
47
	$(CC) $(LDFLAGS) -o $@ $^ $(FFMPEG_LIB) $(EXTRALIBS)
47
ffserver$(EXE): ffserver.o $(DEP_LIBS)
48
	$(CC) $(LDFLAGS) -o $@ ffserver.o -L./libavcodec -L./libav \
49
              -lavformat -lavcodec $(EXTRALIBS)
48 50

  
49 51
ffplay: ffmpeg$(EXE)
50 52
	ln -sf $< $@

Also available in: Unified diff