infinte recursion fix

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index f198efcc587171d6b5686d384e6be934f612dfa1..8aaa51b70f7d4cc9568761dab82bcbc04f7f97b6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
 #
 # Main ffmpeg Makefile
-# (c) 2000, 2001, 2002 Fabrice Bellard
+# (c) 2000-2004 Fabrice Bellard
 #
 include config.mak
 
 VPATH=$(SRC_PATH)
 
-CFLAGS= $(OPTFLAGS) -Wall -g -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+CFLAGS=$(OPTFLAGS) -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
 LDFLAGS+= -g 
 
 ifeq ($(TARGET_GPROF),yes)
@@ -14,15 +14,20 @@ CFLAGS+=-p
 LDFLAGS+=-p
 endif
 
+MANPAGE=$(SRC_PATH)/doc/ffmpeg.1
 PROG=ffmpeg$(EXESUF)
 PROGTEST=output_example$(EXESUF)
+QTFASTSTART=qt-faststart$(EXESUF)
 
 ifeq ($(CONFIG_FFSERVER),yes)
+MANPAGE+=$(SRC_PATH)/doc/ffserver.1
 PROG+=ffserver$(EXESUF)
 endif
 
 ifeq ($(CONFIG_FFPLAY),yes)
+MANPAGE+=$(SRC_PATH)/doc/ffplay.1
 PROG+=ffplay$(EXESUF)
+FFPLAY_O=ffplay.o
 endif
 
 ifeq ($(CONFIG_AUDIO_BEOS),yes)
@@ -39,7 +44,7 @@ endif
 endif
 
 ifeq ($(CONFIG_VORBIS),yes)
-EXTRALIBS+=-logg -lvorbis -lvorbisenc
+EXTRALIBS+=-lvorbis -lvorbisenc -logg
 endif
 
 ifeq ($(CONFIG_FAAD),yes)
@@ -50,6 +55,14 @@ EXTRALIBS += -lfaad
 endif
 endif
 
+ifeq ($(CONFIG_FAAC),yes)
+EXTRALIBS+=-lfaac
+endif
+
+ifeq ($(CONFIG_XVID),yes)
+EXTRALIBS+=-lxvidcore
+endif
+
 ifeq ($(BUILD_VHOOK),yes)
 VHOOK=videohook
 INSTALLVHOOK=install-vhook
@@ -62,11 +75,15 @@ else
 TEST=test
 endif
 
-OBJS = ffmpeg.o ffserver.o cmdutils.o ffplay.o
+ifeq ($(BUILD_DOC),yes)
+DOC=documentation
+endif
+
+OBJS = ffmpeg.o ffserver.o cmdutils.o $(FFPLAY_O)
 SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
 FFLIBS = -L./libavformat -lavformat -L./libavcodec -lavcodec
 
-all: lib $(PROG) $(PROGTEST) $(VHOOK)
+all: lib $(PROG) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC)
 
 lib:
        $(MAKE) -C libavcodec all
@@ -92,6 +109,12 @@ ffplay$(EXESUF): ffplay_g$(EXESUF)
 output_example$(EXESUF): output_example.o .libs
        $(CC) $(LDFLAGS) -o $@ output_example.o $(FFLIBS) $(EXTRALIBS)
 
+qt-faststart$(EXESUF): qt-faststart.c
+       $(CC) $(SRC_PATH)/qt-faststart.c -o qt-faststart$(EXESUF)
+
+cws2fws$(EXESUF): cws2fws.c
+       $(CC) $(SRC_PATH)/cws2fws.c -o cws2fws$(EXESUF) -lz
+
 ffplay.o: ffplay.c
        $(CC) $(CFLAGS) $(SDL_CFLAGS) -c -o $@ $< 
 
@@ -101,13 +124,16 @@ ffplay.o: ffplay.c
 videohook: .libs
        $(MAKE) -C vhook all
 
+documentation:
+       $(MAKE) -C doc all
+
 .PHONY: install
 
 install: all install-man $(INSTALLVHOOK)
        $(MAKE) -C libavcodec install
        $(MAKE) -C libavformat install
        install -d "$(bindir)"
-       install -c -s -m 755 $(PROG) "$(bindir)"
+       install -c $(INSTALLSTRIP) -m 755 $(PROG) "$(bindir)"
 
 # create the window installer
 wininstaller: all install
@@ -117,17 +143,13 @@ wininstaller: all install
 install-man:
 ifneq ($(CONFIG_WIN32),yes)
        if [ -f $(SRC_PATH)/doc/ffmpeg.1 ] ; then \
-           install -d $(mandir)/man1 ; \
-           install -m 644 $(SRC_PATH)/doc/ffmpeg.1 $(SRC_PATH)/doc/ffplay.1 \
-                           $(SRC_PATH)/doc/ffserver.1 $(mandir)/man1 ; \
+           install -d "$(mandir)/man1" ; \
+           install -m 644 $(MANPAGE) "$(mandir)/man1" ; \
        fi
 endif
 
-install-vhook: $(prefix)/lib/vhook
-       $(MAKE) -C vhook install INSTDIR=$(prefix)/lib/vhook
-
-$(prefix)/lib/vhook:
-       install -d $@
+install-vhook:
+       $(MAKE) -C vhook install
 
 installlib:
        $(MAKE) -C libavcodec installlib
@@ -143,7 +165,7 @@ ifeq ($(BUILD_VHOOK),yes)
 endif
 
 .depend: $(SRCS)
-       $(CC) -MM $(CFLAGS) $^ 1>.depend
+       $(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $^ 1>.depend
 
 .libs: lib
        @test -f .libs || touch .libs
@@ -153,11 +175,13 @@ clean: $(CLEANVHOOK)
        $(MAKE) -C libavcodec clean
        $(MAKE) -C libavformat clean
        $(MAKE) -C tests clean
-       rm -f *.o *.d *~ .libs .depend gmon.out TAGS ffmpeg_g$(EXESUF) ffplay_g$(EXESUF) $(PROG) 
+       rm -f *.o *.d *~ .libs .depend gmon.out TAGS ffmpeg_g$(EXESUF) \
+          ffplay_g$(EXESUF) $(PROG) $(PROGTEST) $(QTFASTSTART)
 
 clean-vhook:
        $(MAKE) -C vhook clean
 
+# Note well: config.log is NOT removed.
 distclean: clean
        $(MAKE) -C libavcodec distclean
        rm -f config.mak config.h