# HG changeset patch # User mru # Date 1204836284 0 # Node ID 9375720f6ed10fb3fe6ff9d7e4482c2564e4c28f # Parent 0c3cc1d7a0b310d1de865a5697ad23bcc947ecda consolidate CFLAGS, LDFLAGS, EXTRALIBS assignment diff -r 0c3cc1d7a0b3 -r 9375720f6ed1 Makefile --- a/Makefile Thu Mar 06 17:41:31 2008 +0000 +++ b/Makefile Thu Mar 06 20:44:44 2008 +0000 @@ -4,8 +4,6 @@ # include ../config.mak -CFLAGS += -I$(SRC_PATH)/libswscale -I$(SRC_PATH)/libavcodec - OBJS = allcodecs.o \ audioconvert.o \ bitstream.o \ @@ -456,7 +454,7 @@ bfin/idct_bfin.o \ bfin/vp3_idct_bfin.o \ -EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS) +FFLIBS = avutil NAME=avcodec LIBVERSION=$(LAVCVERSION)