Skip to content
Snippets Groups Projects
Commit 426c31a1 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

make dep fixes by (Måns Rullgård <mru at kth dot se>) 

Originally committed as revision 3379 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 4ccbc7d5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 2 deletions
Makefile
+ 3
− 2
View file @ 426c31a1
...@@ -27,6 +27,7 @@ endif ...@@ -27,6 +27,7 @@ endif
ifeq ($(CONFIG_FFPLAY),yes) ifeq ($(CONFIG_FFPLAY),yes)
MANPAGE+=$(SRC_PATH)/doc/ffplay.1 MANPAGE+=$(SRC_PATH)/doc/ffplay.1
PROG+=ffplay$(EXESUF) PROG+=ffplay$(EXESUF)
FFPLAY_O=ffplay.o
endif endif
ifeq ($(CONFIG_AUDIO_BEOS),yes) ifeq ($(CONFIG_AUDIO_BEOS),yes)
...@@ -78,7 +79,7 @@ ifeq ($(BUILD_DOC),yes) ...@@ -78,7 +79,7 @@ ifeq ($(BUILD_DOC),yes)
DOC=documentation DOC=documentation
endif endif
OBJS = ffmpeg.o ffserver.o cmdutils.o ffplay.o OBJS = ffmpeg.o ffserver.o cmdutils.o $(FFPLAY_O)
SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s) SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
FFLIBS = -L./libavformat -lavformat -L./libavcodec -lavcodec FFLIBS = -L./libavformat -lavformat -L./libavcodec -lavcodec
...@@ -109,7 +110,7 @@ output_example$(EXESUF): output_example.o .libs ...@@ -109,7 +110,7 @@ output_example$(EXESUF): output_example.o .libs
$(CC) $(LDFLAGS) -o $@ output_example.o $(FFLIBS) $(EXTRALIBS) $(CC) $(LDFLAGS) -o $@ output_example.o $(FFLIBS) $(EXTRALIBS)
qt-faststart$(EXESUF): qt-faststart.c qt-faststart$(EXESUF): qt-faststart.c
$(CC) qt-faststart.c -o qt-faststart$(EXESUF) $(CC) $(SRC_PATH)/qt-faststart.c -o qt-faststart$(EXESUF)
ffplay.o: ffplay.c ffplay.o: ffplay.c
$(CC) $(CFLAGS) $(SDL_CFLAGS) -c -o $@ $< $(CC) $(CFLAGS) $(SDL_CFLAGS) -c -o $@ $<
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment