use sse16_sse2() in nsse

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 7c2cd937f2dfbca4560db59f3ff84ba91c6591dc..058bc148b6fb46a3a432985978c329f221b8f033 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)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
+CFLAGS=$(OPTFLAGS) -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil -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)
@@ -38,39 +38,6 @@ ifeq ($(BUILD_SHARED),yes)
 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_LIBOGG),yes)
-EXTRALIBS+= -logg 
-ifeq ($(CONFIG_LIBVORBIS),yes)
-EXTRALIBS+= -lvorbis -lvorbisenc
-endif
-ifeq ($(CONFIG_LIBTHEORA),yes)
-EXTRALIBS+= -ltheora
-endif
-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 ($(CONFIG_XVID),yes)
-EXTRALIBS+=-lxvidcore
-endif
-
-ifeq ($(CONFIG_DC1394),yes)
-EXTRALIBS+=-ldc1394_control -lraw1394
 endif
 
 ifeq ($(BUILD_VHOOK),yes)
@@ -91,11 +58,12 @@ 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
+FFLIBS = -L./libavformat -lavformat$(BUILDSUF) -L./libavcodec -lavcodec$(BUILDSUF) -L./libavutil -lavutil$(BUILDSUF)
 
 all: lib $(PROG) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC)
 
 lib:
+       $(MAKE) -C libavutil all
        $(MAKE) -C libavcodec all
        $(MAKE) -C libavformat all
 
@@ -140,6 +108,7 @@ documentation:
 .PHONY: install
 
 install: all install-man $(INSTALLVHOOK)
+       $(MAKE) -C libavutil install
        $(MAKE) -C libavcodec install
        $(MAKE) -C libavformat install
        install -d "$(bindir)"
@@ -162,6 +131,7 @@ install-vhook:
        $(MAKE) -C vhook install
 
 installlib:
+       $(MAKE) -C libavutil installlib
        $(MAKE) -C libavcodec installlib
        $(MAKE) -C libavformat installlib
 
@@ -182,6 +152,7 @@ endif
        @for i in $(DEP_LIBS) ; do if $(TEST) $$i -nt .libs ; then touch .libs; fi ; done
 
 clean: $(CLEANVHOOK)
+       $(MAKE) -C libavutil clean
        $(MAKE) -C libavcodec clean
        $(MAKE) -C libavformat clean
        $(MAKE) -C tests clean
@@ -194,7 +165,7 @@ clean-vhook:
 # Note well: config.log is NOT removed.
 distclean: clean
        $(MAKE) -C libavcodec distclean
-       rm -f config.mak config.h
+       rm -f config.mak config.h *.pc
 
 TAGS:
        etags *.[ch] libavformat/*.[ch] libavcodec/*.[ch]