cosmetics: move avg function ptrs from pixf to mc.

[x264] / Makefile

diff --git a/Makefile b/Makefile
index 05c9a9d743c3089f89319e5bb73d49112ff12ab1..f40b2107ae3a1420cf873ad7e57797fb0eb6c8e3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,8 @@ include config.mak
 
 SRCS = common/mc.c common/predict.c common/pixel.c common/macroblock.c \
        common/frame.c common/dct.c common/cpu.c common/cabac.c \
-       common/common.c common/mdate.c common/csp.c \
+       common/common.c common/mdate.c common/csp.c common/set.c \
+       common/quant.c \
        encoder/analyse.c encoder/me.c encoder/ratecontrol.c \
        encoder/set.c encoder/macroblock.c encoder/cabac.c \
        encoder/cavlc.c encoder/encoder.c encoder/eval.c
@@ -19,7 +20,8 @@ ifeq ($(ARCH),X86)
 SRCS   += common/i386/mc-c.c common/i386/dct-c.c common/i386/predict.c
 ASMSRC  = common/i386/dct-a.asm common/i386/cpu-a.asm \
           common/i386/pixel-a.asm common/i386/mc-a.asm \
-          common/i386/mc-a2.asm common/i386/predict-a.asm
+          common/i386/mc-a2.asm common/i386/predict-a.asm \
+          common/i386/pixel-sse2.asm common/i386/quant-a.asm
 OBJASM  = $(ASMSRC:%.asm=%.o)
 endif
 
@@ -28,7 +30,8 @@ ifeq ($(ARCH),X86_64)
 SRCS   += common/i386/mc-c.c common/i386/dct-c.c common/i386/predict.c
 ASMSRC  = common/amd64/dct-a.asm common/amd64/cpu-a.asm \
           common/amd64/pixel-a.asm common/amd64/mc-a.asm \
-          common/amd64/mc-a2.asm common/amd64/predict-a.asm
+          common/amd64/mc-a2.asm common/amd64/predict-a.asm \
+          common/amd64/pixel-sse2.asm common/amd64/quant-a.asm
 OBJASM  = $(ASMSRC:%.asm=%.o)
 endif
 
@@ -37,6 +40,19 @@ ifeq ($(ARCH),PPC)
 SRCS += common/ppc/mc.c common/ppc/pixel.c common/ppc/dct.c
 endif
 
+# VIS optims
+ifeq ($(ARCH),UltraSparc)
+ASMSRC += common/sparc/pixel.asm
+OBJASM  = $(ASMSRC:%.asm=%.o)
+endif
+
+ifneq ($(HAVE_GETOPT_LONG),1)
+SRCS += extras/getopt.c
+CFLAGS += -DHAVE_GETOPT_LONG=0
+else
+CFLAGS += -DHAVE_GETOPT_LONG=1
+endif
+
 OBJS = $(SRCS:%.c=%.o)
 DEP  = depend
 
@@ -46,8 +62,8 @@ libx264.a: .depend $(OBJS) $(OBJASM)
        ar rc libx264.a $(OBJS) $(OBJASM)
        ranlib libx264.a
 
-x264$(EXE): libx264.a x264.o
-       $(CC) -o $@ x264.o libx264.a $(LDFLAGS)
+x264$(EXE): libx264.a x264.o matroska.o
+       $(CC) -o $@ x264.o matroska.o libx264.a $(LDFLAGS)
 
 x264vfw.dll: libx264.a $(wildcard vfw/*.c vfw/*.h)
        make -C vfw/build/cygwin
@@ -61,7 +77,7 @@ checkasm: testing/checkasm.o libx264.a
 .depend: config.mak config.h
        rm -f .depend
 # Hacky - because gcc 2.9x doesn't have -MT
-       $(foreach SRC, $(SRCS) x264.c, ( echo -n "`dirname $(SRC)`/" && $(CC) $(CFLAGS) $(SRC) -MM -g0 ) 1>> .depend;)
+       $(foreach SRC, $(SRCS) x264.c matroska.c, ( echo -n "`dirname $(SRC)`/" && $(CC) $(CFLAGS) $(SRC) -MM -g0 ) 1>> .depend;)
 
 config.h: $(wildcard .svn/entries */.svn/entries */*/.svn/entries)
        ./version.sh
@@ -72,17 +88,18 @@ include .depend
 endif
 
 clean:
-       rm -f $(OBJS) $(OBJASM) config.h *.a x264.o x264 x264.exe .depend TAGS
+       rm -f $(OBJS) $(OBJASM) config.h *.a x264.o matroska.o x264 x264.exe .depend TAGS
        rm -rf vfw/build/cygwin/bin
 
 distclean: clean
        rm -f config.mak vfw/build/cygwin/config.mak
 
-DIR_INSTALL="/usr/local"
 install: x264
-       install x264.h $(DIR_INSTALL)/include/
-       install libx264.a $(DIR_INSTALL)/lib/
-       install x264 $(DIR_INSTALL)/bin/
+       install -d $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
+       install -m 644 x264.h $(DESTDIR)$(includedir)
+       install -m 644 libx264.a $(DESTDIR)$(libdir)
+       install x264 $(DESTDIR)$(bindir)
+       ranlib $(DESTDIR)$(libdir)/libx264.a
 
 etags: TAGS