Mercurial > libavformat.hg

changeset 3119:b1caac2f77ad libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
consolidate CFLAGS, LDFLAGS, EXTRALIBS assignment
author mru
date Thu, 06 Mar 2008 20:44:44 +0000
parents 4410d9725469
children ea5623a8efde
files Makefile
diffstat 1 files changed, 2 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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)