diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-09-08 18:28:58 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-09-08 18:28:58 +0000 |
| commit | 6de9e506490ccb1bbafa9092cd32b8d992e1e5fd (patch) | |
| tree | 549497020259966bd440478b7cbae2af3e058238 /Makefile | |
| parent | f381af7b7fa9f8e7c97cf0367f6920b692fc7d7f (diff) | |
FFLIBS --> EXTRALIBS
Originally committed as revision 6203 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -59,11 +59,11 @@ endif OBJS = ffmpeg.o ffserver.o cmdutils.o ffplay.o SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s) LDFLAGS += -L./libavformat -L./libavcodec -L./libavutil -FFLIBS = -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) +EXTRALIBS += -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) ifeq ($(CONFIG_SWSCALER),yes) LDFLAGS+=-L./libswscale -FFLIBS+=-lswscale$(BUILDSUF) +EXTRALIBS+=-lswscale$(BUILDSUF) endif all: version.h lib $(PROGS_G) $(PROGS) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC) @@ -80,13 +80,13 @@ ifeq ($(CONFIG_SWSCALER),yes) endif ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs - $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS) + $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(EXTRALIBS) ffserver$(EXESUF): ffserver.o .libs - $(CC) $(LDFLAGS) $(FFSERVERLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS) + $(CC) $(LDFLAGS) $(FFSERVERLDFLAGS) -o $@ ffserver.o $(EXTRALIBS) ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs - $(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS) + $(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(EXTRALIBS) $(SDL_LIBS) %$(EXESUF): %_g$(EXESUF) cp -p $< $@ @@ -97,7 +97,7 @@ version.h: $(SRC_PATH)/version.sh "$(SRC_PATH)" output_example$(EXESUF): output_example.o .libs - $(CC) $(LDFLAGS) -o $@ output_example.o $(FFLIBS) $(EXTRALIBS) + $(CC) $(LDFLAGS) -o $@ output_example.o $(EXTRALIBS) qt-faststart$(EXESUF): qt-faststart.c $(CC) $(CFLAGS) $(SRC_PATH)/$< -o $@ |