Add x86 conditionnal mov (CMOV) "detection" (based on the cpu passed by --cpu=xx)

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 27b9f8899df3fbbe5c66c5713edb0274d712426c..add831458369e7c5ebc0170c07566d3cbb61f31c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ include config.mak
 
 VPATH=$(SRC_PATH)
 
-CFLAGS=$(OPTFLAGS) -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil \
+CFLAGS=$(OPTFLAGS) -I$(BUILD_ROOT) -I$(SRC_PATH) -I$(SRC_PATH)/libavutil \
        -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat \
        -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_ISOC9X_SOURCE
 LDFLAGS+= -g
@@ -30,7 +30,6 @@ ifeq ($(CONFIG_FFPLAY),yes)
 MANPAGES+=doc/ffplay.1
 PROGS_G+=ffplay_g$(EXESUF)
 PROGS+=ffplay$(EXESUF)
-FFPLAY_O=ffplay.o
 endif
 
 BASENAMES=ffmpeg ffplay ffserver
@@ -57,17 +56,17 @@ ifeq ($(BUILD_DOC),yes)
 DOC=documentation
 endif
 
-OBJS = ffmpeg.o ffserver.o cmdutils.o $(FFPLAY_O)
+OBJS = ffmpeg.o ffserver.o cmdutils.o ffplay.o
 SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
-FFLIBDIRS = -L./libavformat -L./libavcodec -L./libavutil
-FFLIBS = -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF)
+LDFLAGS := -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil $(LDFLAGS)
+EXTRALIBS := -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)
 
 ifeq ($(CONFIG_SWSCALER),yes)
-FFLIBDIRS+=-L./libswscale
-FFLIBS+=-lswscale$(BUILDSUF)
+LDFLAGS+=-L./libswscale
+EXTRALIBS+=-lswscale$(BUILDSUF)
 endif
 
-all: version.h lib $(PROGS_G) $(PROGS) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC)
+all: lib $(PROGS_G) $(PROGS) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC)
 
 lib:
        $(MAKE) -C libavutil   all
@@ -81,34 +80,35 @@ ifeq ($(CONFIG_SWSCALER),yes)
 endif
 
 ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
-       $(CC) $(FFLIBDIRS) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS)
+       $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(EXTRALIBS)
 
 ffserver$(EXESUF): ffserver.o .libs
-       $(CC) $(FFLIBDIRS) $(LDFLAGS) $(FFSERVERLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS)
+       $(CC) $(LDFLAGS) $(FFSERVERLDFLAGS) -o $@ ffserver.o $(EXTRALIBS)
 
 ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs
-       $(CC) $(FFLIBDIRS) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS)
+       $(CC) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(EXTRALIBS) $(SDL_LIBS)
 
 %$(EXESUF): %_g$(EXESUF)
        cp -p $< $@
        $(STRIP) $@
 
-.PHONY: version.h
 version.h:
        $(SRC_PATH)/version.sh "$(SRC_PATH)"
 
 output_example$(EXESUF): output_example.o .libs
-       $(CC) $(FFLIBDIRS) $(LDFLAGS) -o $@ output_example.o $(FFLIBS) $(EXTRALIBS)
+       $(CC) $(LDFLAGS) -o $@ output_example.o $(EXTRALIBS)
 
 qt-faststart$(EXESUF): qt-faststart.c
-       $(CC) $(CFLAGS) $(SRC_PATH)/qt-faststart.c -o qt-faststart$(EXESUF)
+       $(CC) $(CFLAGS) $< -o $@
 
 cws2fws$(EXESUF): cws2fws.c
-       $(CC) $(SRC_PATH)/cws2fws.c -o cws2fws$(EXESUF) -lz
+       $(CC) $< -o $@ -lz
 
 ffplay.o: ffplay.c
        $(CC) $(CFLAGS) $(SDL_CFLAGS) -c -o $@ $<
 
+ffmpeg.o ffplay.o ffserver.o: version.h
+
 %.o: %.c
        $(CC) $(CFLAGS) -c -o $@ $<
 
@@ -118,8 +118,6 @@ videohook: .libs
 documentation:
        $(MAKE) -C doc all
 
-.PHONY: install
-
 install: install-progs install-libs install-headers install-man $(INSTALLVHOOK)
 
 ifeq ($(BUILD_SHARED),yes)
@@ -205,12 +203,18 @@ depend: .depend
        $(MAKE) -C libavutil   depend
        $(MAKE) -C libavcodec  depend
        $(MAKE) -C libavformat depend
+ifeq ($(CONFIG_PP),yes)
+       $(MAKE) -C libpostproc depend
+endif
+ifeq ($(CONFIG_SWSCALER),yes)
+       $(MAKE) -C libswscale  depend
+endif
 ifeq ($(BUILD_VHOOK),yes)
        $(MAKE) -C vhook       depend
 endif
 
 .depend: $(SRCS) version.h
-       $(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $^ 1>.depend
+       $(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $(SRCS) 1>.depend
 
 .libs: lib
        @test -f .libs || touch .libs
@@ -244,11 +248,11 @@ TAGS:
 
 # regression tests
 
-libavtest test mpeg4 mpeg test-server fulltest: $(PROGS)
+codectest libavtest test-server fulltest test mpeg4 mpeg: $(PROGS)
        $(MAKE) -C tests $@
 
 # tar release (use 'make -k tar' on a checkouted tree)
-FILE=ffmpeg-$(shell grep "\#define FFMPEG_VERSION " libavcodec/avcodec.h | \
+FILE=ffmpeg-$(shell grep "\#define FFMPEG_VERSION " version.h | \
                     cut -d "\"" -f 2 )
 
 tar:
@@ -257,7 +261,9 @@ tar:
        ( cd /tmp ; tar zcvf ~/$(FILE).tar.gz $(FILE) --exclude .svn )
        rm -rf /tmp/$(FILE)
 
-.PHONY: lib
+.PHONY: all lib videohook documentation install* wininstaller uninstall*
+.PHONY: dep depend clean distclean TAGS tar
+.PHONY: codectest libavtest test-server fulltest test mpeg4 mpeg
 
 ifneq ($(wildcard .depend),)
 include .depend