Revision 6de9e506

View differences:

Makefile
59 59
OBJS = ffmpeg.o ffserver.o cmdutils.o ffplay.o
60 60
SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
61 61
LDFLAGS += -L./libavformat -L./libavcodec -L./libavutil
62
FFLIBS = -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF)
62
EXTRALIBS += -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF)
63 63

  
64 64
ifeq ($(CONFIG_SWSCALER),yes)
65 65
LDFLAGS+=-L./libswscale
66
FFLIBS+=-lswscale$(BUILDSUF)
66
EXTRALIBS+=-lswscale$(BUILDSUF)
67 67
endif
68 68

  
69 69
all: version.h lib $(PROGS_G) $(PROGS) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC)
......
80 80
endif
81 81

  
82 82
ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
83
	$(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS)
83
	$(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(EXTRALIBS)
84 84

  
85 85
ffserver$(EXESUF): ffserver.o .libs
86
	$(CC) $(LDFLAGS) $(FFSERVERLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS)
86
	$(CC) $(LDFLAGS) $(FFSERVERLDFLAGS) -o $@ ffserver.o $(EXTRALIBS)
87 87

  
88 88
ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs
89
	$(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS)
89
	$(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(EXTRALIBS) $(SDL_LIBS)
90 90

  
91 91
%$(EXESUF): %_g$(EXESUF)
92 92
	cp -p $< $@
......
97 97
	$(SRC_PATH)/version.sh "$(SRC_PATH)"
98 98

  
99 99
output_example$(EXESUF): output_example.o .libs
100
	$(CC) $(LDFLAGS) -o $@ output_example.o $(FFLIBS) $(EXTRALIBS)
100
	$(CC) $(LDFLAGS) -o $@ output_example.o $(EXTRALIBS)
101 101

  
102 102
qt-faststart$(EXESUF): qt-faststart.c
103 103
	$(CC) $(CFLAGS) $(SRC_PATH)/$< -o $@

Also available in: Unified diff