X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=35155bcfbb1ab8484d004fc05697e0de517b39b3;hb=8de65d4f1170e81da42060689bba8fedc184ddf5;hp=4d6f3664e6af6c1ba0ad93efc772fd1e1f8560ba;hpb=f3ec2d46bae60984cb9d0a26e94a2cc298b4f06d;p=ffmpeg

diff --git a/Makefile b/Makefile
index 4d6f3664e6a..35155bcfbb1 100644
--- a/Makefile
+++ b/Makefile
@@ -16,18 +16,23 @@ 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)
+PROGTEST=output_example$(EXE)
+
+ifeq ($(CONFIG_FFSERVER),yes)
+PROG+=ffserver$(EXE)
+endif
+
+ifeq ($(CONFIG_FFPLAY),yes)
+PROG+=ffplay$(EXE)
 endif
 
 ifeq ($(CONFIG_AUDIO_BEOS),yes)
@@ -35,15 +40,24 @@ EXTRALIBS+=-lmedia -lbe
 endif
 
 ifeq ($(BUILD_SHARED),yes)
-DEP_LIBS=libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF)
+DEP_LIBS=libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF)
 else
 DEP_LIBS=libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF)
 ifeq ($(CONFIG_MP3LAME),yes)
 EXTRALIBS+=-lmp3lame
 endif
+endif
+
 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)
@@ -52,42 +66,56 @@ 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)
+all: lib $(PROG) $(PROGTEST) $(VHOOK)
 
-lib:
+lib: $(AMRLIBS)
 	$(MAKE) -C libavcodec all
 	$(MAKE) -C libavformat all
 
-ffmpeg_g$(EXE): ffmpeg.o $(DEP_LIBS)
-	$(CC) $(LDFLAGS) -o $@ ffmpeg.o -L./libavcodec -L./libavformat \
-              -lavformat -lavcodec $(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 $< $@
 	$(STRIP) $@
 
-ffserver$(EXE): ffserver.o $(DEP_LIBS)
-	$(CC) $(LDFLAGS) $(FFSLDFLAGS) \
-		-o $@ ffserver.o -L./libavcodec -L./libavformat \
-              -lavformat -lavcodec $(EXTRALIBS) 
+ffserver$(EXE): ffserver.o .libs
+	$(CC) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS) 
+
+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: ffmpeg$(EXE)
-	ln -sf $< $@
+output_example$(EXE): 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 $@ $< 
 
-videohook:
+videohook: .libs
 	$(MAKE) -C vhook all
 
 install: all $(INSTALLVHOOK)
 	$(MAKE) -C libavcodec install
+	$(MAKE) -C libavformat 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
@@ -101,14 +129,25 @@ installlib:
 
 dep:	depend
 
-depend:
-	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
+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 libavformat clean
 	$(MAKE) -C tests clean
-	rm -f *.o *~ .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
@@ -122,7 +161,7 @@ TAGS:
 
 # regression tests
 
-libavtest test mpeg4 mpeg: ffmpeg$(EXE)
+libavtest test mpeg4 mpeg test-server fulltest: ffmpeg$(EXE)
 	$(MAKE) -C tests $@
 
 # tar release (use 'make -k tar' on a checkouted tree)
@@ -134,6 +173,8 @@ tar:
 	( cd /tmp ; tar zcvf ~/$(FILE).tar.gz $(FILE) --exclude CVS )
 	rm -rf /tmp/$(FILE)
 
+.PHONY: lib
+
 ifneq ($(wildcard .depend),)
 include .depend
 endif