added ffserver disabling for easier porting

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index a4f8d579df848b0d405e40489dae389250d3bef2..a954e0e7b4d1b559e61e448e6aa8a1f69d6fc55e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,14 @@
+#
 # 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) -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
+LDFLAGS+= -g 
+
 ifeq ($(TARGET_GPROF),yes)
 CFLAGS+=-p
 LDFLAGS+=-p
@@ -15,34 +19,54 @@ EXE=.exe
 PROG=ffmpeg$(EXE)
 else
 EXT=
-PROG=ffmpeg ffplay ffserver
+PROG=ffmpeg ffplay
+ifeq ($(CONFIG_FFSERVER),yes)
+PROG+=ffserver
+endif
+endif
+
+ifeq ($(CONFIG_AUDIO_BEOS),yes)
+EXTRALIBS+=-lmedia -lbe
 endif
 
 ifeq ($(BUILD_SHARED),yes)
-FFMPEG_LIB=-Llibavcodec -lffmpeg
-DEP_FFMPEG_LIB=
+DEP_LIBS=libavcodec/libavcodec.so libavformat/libavformat.a
 else
-FFMPEG_LIB=libavcodec/libavcodec.a
-DEP_FFMPEG_LIB=libavcodec/libavcodec.a
+DEP_LIBS=libavcodec/libavcodec.a libavformat/libavformat.a
 ifeq ($(CONFIG_MP3LAME),yes)
 EXTRALIBS+=-lmp3lame
 endif
+ifeq ($(CONFIG_VORBIS),yes)
+EXTRALIBS+=-logg -lvorbis -lvorbisenc
+endif
+endif
+
+ifeq ($(BUILD_VHOOK),yes)
+VHOOK=videohook
+INSTALLVHOOK=install-vhook
+CLEANVHOOK=clean-vhook
 endif
 
 OBJS = ffmpeg.o ffserver.o
 SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
 
-all: lib $(PROG)
+all: lib $(PROG) $(VHOOK)
 
 lib:
        $(MAKE) -C libavcodec all
-       $(MAKE) -C libav all
+       $(MAKE) -C libavformat all
 
-ffmpeg$(EXE): ffmpeg.o libav/libav.a $(DEP_FFMPEG_LIB)
-       $(CC) $(LDFLAGS) -o $@ $^ $(FFMPEG_LIB) $(EXTRALIBS)
+ffmpeg_g$(EXE): ffmpeg.o $(DEP_LIBS)
+       $(CC) $(LDFLAGS) -o $@ ffmpeg.o -L./libavcodec -L./libavformat \
+              -lavformat -lavcodec $(EXTRALIBS)
 
-ffserver$(EXE): ffserver.o libav/libav.a $(DEP_FFMPEG_LIB)
-       $(CC) $(LDFLAGS) -o $@ $^ $(FFMPEG_LIB) $(EXTRALIBS)
+ffmpeg$(EXE): ffmpeg_g$(EXE)
+       cp -p $< $@ ; $(STRIP) $@
+
+ffserver$(EXE): ffserver.o $(DEP_LIBS)
+       $(CC) $(LDFLAGS) $(FFSLDFLAGS) \
+               -o $@ ffserver.o -L./libavcodec -L./libavformat \
+              -lavformat -lavcodec $(EXTRALIBS) 
 
 ffplay: ffmpeg$(EXE)
        ln -sf $< $@
@@ -50,27 +74,50 @@ ffplay: ffmpeg$(EXE)
 %.o: %.c
        $(CC) $(CFLAGS) -c -o $@ $< 
 
-install: all
+videohook:
+       $(MAKE) -C vhook all
+
+install: all $(INSTALLVHOOK)
        $(MAKE) -C libavcodec install
+       install -d $(prefix)/bin
        install -s -m 755 $(PROG) $(prefix)/bin
        ln -sf ffmpeg $(prefix)/bin/ffplay 
 
+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
 
 depend:
        $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
-clean: 
+clean: $(CLEANVHOOK)
        $(MAKE) -C libavcodec clean
-       $(MAKE) -C libav clean
-       rm -f *.o *~ .depend gmon.out TAGS $(PROG) 
+       $(MAKE) -C libavformat clean
+       $(MAKE) -C tests clean
+       rm -f *.o *~ .depend gmon.out TAGS ffmpeg_g$(EXE) $(PROG) 
+
+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: ffmpeg$(EXE)
+       $(MAKE) -C tests $@
 
 ifneq ($(wildcard .depend),)
 include .depend