diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-08-11 01:24:28 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-08-11 01:24:28 +0000 |
| commit | 426c31a1a005721f728eed929bab8c67004f8efc (patch) | |
| tree | 72fec5016b99f6da62963daec718685a1c1b7d1c | |
| parent | 4ccbc7d5a9ca00ec4e42451c76e7803531f32f55 (diff) | |
| download | ffmpeg-426c31a1a005721f728eed929bab8c67004f8efc.tar.gz | |
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
| -rw-r--r-- | Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -27,6 +27,7 @@ endif ifeq ($(CONFIG_FFPLAY),yes) MANPAGE+=$(SRC_PATH)/doc/ffplay.1 PROG+=ffplay$(EXESUF) +FFPLAY_O=ffplay.o endif ifeq ($(CONFIG_AUDIO_BEOS),yes) @@ -78,7 +79,7 @@ ifeq ($(BUILD_DOC),yes) DOC=documentation 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) 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) 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 $(CC) $(CFLAGS) $(SDL_CFLAGS) -c -o $@ $< |