av_log patch(2 of ?) by (Michel Bardiaux <mbardiaux at peaktime dot be>)

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index b78c92be0d6eef8e1c4aa92d97a28622766d32e1..d5a9d376e0f279a1d9cbebffd7f9e3402e0272e1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,65 +1,191 @@
+#
 # Main ffmpeg Makefile
-# (c) 2000, 2001 Gerard Lantau
+# (c) 2000, 2001, 2002 Fabrice Bellard
 #
 include config.mak
 
-CFLAGS= $(OPTFLAGS) -Wall -g -I./libavcodec -I./libav 
-LDFLAGS= -g
+VPATH=$(SRC_PATH)
+
+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)
 CFLAGS+=-p
 LDFLAGS+=-p
 endif
 
-ifeq ($(CONFIG_WIN32),yes)
-EXE=.exe
-PROG=ffmpeg$(EXE)
-else
-EXT=
-PROG=ffmpeg ffplay ffserver
+PROG=ffmpeg$(EXESUF)
+PROGTEST=output_example$(EXESUF)
+
+ifeq ($(CONFIG_FFSERVER),yes)
+PROG+=ffserver$(EXESUF)
+endif
+
+ifeq ($(CONFIG_FFPLAY),yes)
+PROG+=ffplay$(EXESUF)
+endif
+
+ifeq ($(CONFIG_AUDIO_BEOS),yes)
+EXTRALIBS+=-lmedia -lbe
 endif
 
 ifeq ($(BUILD_SHARED),yes)
-FFMPEG_LIB=-Llibavcodec -lffmpeg
-DEP_FFMPEG_LIB=
+DEP_LIBS=libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF)
 else
-FFMPEG_LIB=libavcodec/libavcodec.a
-DEP_FFMPEG_LIB=libavcodec/libavcodec.a
+DEP_LIBS=libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF)
 ifeq ($(CONFIG_MP3LAME),yes)
 EXTRALIBS+=-lmp3lame
 endif
 endif
 
-all: lib $(PROG)
+ifeq ($(CONFIG_VORBIS),yes)
+EXTRALIBS+=-logg -lvorbis -lvorbisenc
+endif
+
+ifeq ($(CONFIG_FAAD),yes)
+ifeq ($(CONFIG_FAADBIN),yes)
+# no libs needed
+else
+EXTRALIBS += -lfaad
+endif
+endif
+
+ifeq ($(CONFIG_FAAC),yes)
+EXTRALIBS+=-lfaac
+endif
+
+ifeq ($(BUILD_VHOOK),yes)
+VHOOK=videohook
+INSTALLVHOOK=install-vhook
+CLEANVHOOK=clean-vhook
+endif
+
+ifeq ($(TARGET_OS), SunOS)
+TEST=/usr/bin/test
+else
+TEST=test
+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)
 
 lib:
        $(MAKE) -C libavcodec all
-       $(MAKE) -C libav all
+       $(MAKE) -C libavformat all
+
+ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
+       $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS)
 
-ffmpeg$(EXE): ffmpeg.o libav/libav.a $(DEP_FFMPEG_LIB)
-       $(CC) $(LDFLAGS) $(EXTRALIBS) -o $@ $^ $(FFMPEG_LIB)
+ffmpeg$(EXESUF): ffmpeg_g$(EXESUF)
+       cp -p $< $@
+       $(STRIP) $@
 
-ffserver$(EXE): ffserver.o libav/libav.a $(DEP_FFMPEG_LIB)
-       $(CC) $(LDFLAGS) $(EXTRALIBS) -o $@ $^ $(FFMPEG_LIB)
+ffserver$(EXESUF): ffserver.o .libs
+       $(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS) 
 
-ffplay: ffmpeg$(EXE)
-       ln -sf $< $@
+ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs
+       $(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS)
+
+ffplay$(EXESUF): ffplay_g$(EXESUF)
+       cp -p $< $@
+       $(STRIP) $@
+
+output_example$(EXESUF): output_example.o .libs
+       $(CC) $(LDFLAGS) -o $@ output_example.o $(FFLIBS) $(EXTRALIBS)
+
+ffplay.o: ffplay.c
+       $(CC) $(CFLAGS) $(SDL_CFLAGS) -c -o $@ $< 
 
 %.o: %.c
        $(CC) $(CFLAGS) -c -o $@ $< 
 
-install: all
+videohook: .libs
+       $(MAKE) -C vhook all
+
+.PHONY: install
+
+install: all install-man $(INSTALLVHOOK)
        $(MAKE) -C libavcodec install
-       install -s -m 755 $(PROG) $(prefix)/bin
-       ln -sf ffmpeg $(prefix)/bin/ffplay 
+       $(MAKE) -C libavformat install
+       install -d "$(bindir)"
+       install -c -s -m 755 $(PROG) "$(bindir)"
+
+# create the window installer
+wininstaller: all install
+       makensis ffinstall.nsi
+
+# install man from source dir if available
+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 ; \
+       fi
+endif
+
+install-vhook: $(prefix)/lib/vhook
+       $(MAKE) -C vhook install INSTDIR=$(prefix)/lib/vhook
+
+$(prefix)/lib/vhook:
+       install -d $@
+
+installlib:
+       $(MAKE) -C libavcodec installlib
+       $(MAKE) -C libavformat installlib
+
+dep:   depend
 
-clean: 
+depend: .depend
+       make -C libavcodec depend
+       make -C libavformat depend
+ifeq ($(BUILD_VHOOK),yes)
+       make -C vhook depend
+endif
+
+.depend: $(SRCS)
+       $(CC) -MM $(CFLAGS) $^ 1>.depend
+
+.libs: lib
+       @test -f .libs || touch .libs
+       @for i in $(DEP_LIBS) ; do if $(TEST) $$i -nt .libs ; then touch .libs; fi ; done
+
+clean: $(CLEANVHOOK)
        $(MAKE) -C libavcodec clean
-       $(MAKE) -C libav clean
-       rm -f *.o *~ gmon.out TAGS $(PROG) 
+       $(MAKE) -C libavformat clean
+       $(MAKE) -C tests clean
+       rm -f *.o *.d *~ .libs .depend gmon.out TAGS ffmpeg_g$(EXESUF) ffplay_g$(EXESUF) $(PROG) $(PROGTEST)
+
+clean-vhook:
+       $(MAKE) -C vhook clean
 
 distclean: clean
        $(MAKE) -C libavcodec distclean
        rm -f config.mak config.h
 
 TAGS:
-       etags *.[ch] libav/*.[ch] libavcodec/*.[ch]
+       etags *.[ch] libavformat/*.[ch] libavcodec/*.[ch]
+
+# regression tests
+
+libavtest test mpeg4 mpeg test-server fulltest: ffmpeg$(EXESUF)
+       $(MAKE) -C tests $@
+
+# tar release (use 'make -k tar' on a checkouted tree)
+FILE=ffmpeg-$(shell grep "\#define FFMPEG_VERSION " libavcodec/avcodec.h | \
+                    cut -d "\"" -f 2 )
+
+tar:
+       rm -rf /tmp/$(FILE)
+       cp -r . /tmp/$(FILE)
+       ( cd /tmp ; tar zcvf ~/$(FILE).tar.gz $(FILE) --exclude CVS )
+       rm -rf /tmp/$(FILE)
+
+.PHONY: lib
+
+ifneq ($(wildcard .depend),)
+include .depend
+endif