Browse Source

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
tags/v0.5
Michael Niedermayer 21 years ago
parent
commit
426c31a1a0
1 changed files with 3 additions and 2 deletions
  1. +3
    -2
      Makefile

+ 3
- 2
Makefile View File

@@ -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)
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
$(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 $@ $<


Loading…
Cancel
Save