diff options
| author | Måns Rullgård <mans@mansr.com> | 2008-03-06 20:44:44 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2008-03-06 20:44:44 +0000 |
| commit | 5671fc14f67dd20bb9c4a787022987c39498f44f (patch) | |
| tree | c390cc924efbd489b32a6589f1deba5429e04b16 /libavformat | |
| parent | 4c7981ba7c532928dbe60934a9fc951dbf8a34b5 (diff) | |
| download | ffmpeg-5671fc14f67dd20bb9c4a787022987c39498f44f.tar.gz | |
consolidate CFLAGS, LDFLAGS, EXTRALIBS assignment
Originally committed as revision 12354 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/Makefile | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 041f224a70..c1aabfa80b 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -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_LIBNUT_MUXER) += libnut.o riff.o 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_RTP_PROTOCOL) += rtpproto.o OBJS-$(CONFIG_TCP_PROTOCOL) += tcp.o OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o +FFLIBS = avcodec avutil + NAME=avformat LIBVERSION=$(LAVFVERSION) LIBMAJOR=$(LAVFMAJOR) |