# HG changeset patch
# User mru
# Date 1204836284 0
# Node ID b1caac2f77adf807c2cd737914a5f14a1aed4600
# Parent  4410d97254698317b3e23237cbab32457060ca62
consolidate CFLAGS, LDFLAGS, EXTRALIBS assignment

diff -r 4410d9725469 -r b1caac2f77ad Makefile
--- a/Makefile	Thu Mar 06 17:44:42 2008 +0000
+++ b/Makefile	Thu Mar 06 20:44:44 2008 +0000
@@ -4,8 +4,6 @@
 #
 include ../config.mak
 
-CFLAGS += -I$(SRC_PATH)/libavcodec
-
 OBJS = allformats.o cutils.o os_support.o sdp.o utils.o
 
 HEADERS = avformat.h avio.h rtsp.h rtspcodes.h
@@ -182,9 +180,6 @@
 
 OBJS-$(CONFIG_VHOOK)                     += framehook.o
 
-EXTRALIBS := -L$(BUILD_ROOT)/libavcodec -lavcodec$(BUILDSUF) \
-             -L$(BUILD_ROOT)/libavutil  -lavutil$(BUILDSUF) $(EXTRALIBS)
-
 # protocols I/O
 OBJS+= avio.o aviobuf.o
 
@@ -195,6 +190,8 @@
 OBJS-$(CONFIG_TCP_PROTOCOL)              += tcp.o
 OBJS-$(CONFIG_UDP_PROTOCOL)              += udp.o
 
+FFLIBS = avcodec avutil
+
 NAME=avformat
 LIBVERSION=$(LAVFVERSION)
 LIBMAJOR=$(LAVFMAJOR)