moved the tables into header files (and applied the 'static' patch). Nick: why do...

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 8d77aaa1b585ab8737eafbce15ea5edef66fba46..975aad532061537abd9d301dee65eadcd73e2fee 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,18 +16,22 @@ endif
 
 ifeq ($(CONFIG_WIN32),yes)
 EXE=.exe
-PROG=ffmpeg$(EXE)
 else
 ifeq ($(CONFIG_OS2),yes)
 EXE=.exe
-PROG=ffmpeg$(EXE)
 else
 EXE=
-PROG=ffmpeg ffplay
-ifeq ($(CONFIG_FFSERVER),yes)
-PROG+=ffserver
 endif
 endif
+
+PROG=ffmpeg$(EXE)
+
+ifeq ($(CONFIG_FFSERVER),yes)
+PROG+=ffserver$(EXE)
+endif
+
+ifeq ($(CONFIG_FFPLAY),yes)
+PROG+=ffplay$(EXE)
 endif
 
 ifeq ($(CONFIG_AUDIO_BEOS),yes)
@@ -47,24 +51,38 @@ 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 ($(BUILD_VHOOK),yes)
 VHOOK=videohook
 INSTALLVHOOK=install-vhook
 CLEANVHOOK=clean-vhook
 endif
 
-OBJS = ffmpeg.o ffserver.o
+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) $(VHOOK)
 
-lib:
+lib: $(AMRLIBS)
        $(MAKE) -C libavcodec all
        $(MAKE) -C libavformat all
 
-ffmpeg_g$(EXE): ffmpeg.o .libs
-       $(CC) $(LDFLAGS) -o $@ ffmpeg.o $(FFLIBS) $(EXTRALIBS)
+ffmpeg_g$(EXE): ffmpeg.o cmdutils.o .libs
+       $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS)
 
 ffmpeg$(EXE): ffmpeg_g$(EXE)
        cp -p $< $@
@@ -73,8 +91,15 @@ ffmpeg$(EXE): ffmpeg_g$(EXE)
 ffserver$(EXE): ffserver.o .libs
        $(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS) 
 
-ffplay: ffmpeg$(EXE)
-       ln -sf $< $@
+ffplay_g$(EXE): ffplay.o cmdutils.o .libs
+       $(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS)
+
+ffplay$(EXE): ffplay_g$(EXE)
+       cp -p $< $@
+       $(STRIP) $@
+
+ffplay.o: ffplay.c
+       $(CC) $(CFLAGS) $(SDL_CFLAGS) -c -o $@ $< 
 
 %.o: %.c
        $(CC) $(CFLAGS) -c -o $@ $< 
@@ -86,7 +111,6 @@ install: all $(INSTALLVHOOK)
        $(MAKE) -C libavcodec install
        install -d $(prefix)/bin
        install -c -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
@@ -111,13 +135,14 @@ endif
        $(CC) -MM $(CFLAGS) $^ 1>.depend
 
 .libs: lib
-       touch .libs
+       @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 libavformat clean
        $(MAKE) -C tests clean
-       rm -f *.o *.d *~ .libs .depend gmon.out TAGS ffmpeg_g$(EXE) $(PROG) 
+       rm -f *.o *.d *~ .libs .depend gmon.out TAGS ffmpeg_g$(EXE) ffplay_g$(EXE) $(PROG) 
 
 clean-vhook:
        $(MAKE) -C vhook clean
@@ -132,7 +157,7 @@ TAGS:
 # regression tests
 
 libavtest test mpeg4 mpeg: ffmpeg$(EXE)
-       $(MAKE) -C tests $@
+       $(MAKE) all -C tests $@
 
 # tar release (use 'make -k tar' on a checkouted tree)
 FILE=ffmpeg-$(shell cat VERSION)