Mercurial > libavformat.hg

changeset 1980:5b1369c8bd36 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Get rid of unnecessary conditionals.
author diego
date Tue, 03 Apr 2007 16:33:04 +0000
parents 2169e9435f2a
children b7016078f7c7
files Makefile
diffstat 1 files changed, 4 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Tue Apr 03 15:59:15 2007 +0000
+++ b/Makefile	Tue Apr 03 16:33:04 2007 +0000
@@ -155,19 +155,14 @@
 EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) \
              -lavcodec$(BUILDSUF) -L$(BUILD_ROOT)/libavcodec $(EXTRALIBS)
 
-ifeq ($(CONFIG_AUDIO_BEOS),yes)
-CPPOBJS+= beosaudio.o
-endif
+CPPOBJS-$(CONFIG_AUDIO_BEOS)             += beosaudio.o
 
 # protocols I/O
 OBJS+= avio.o aviobuf.o
 
-ifeq ($(CONFIG_PROTOCOLS),yes)
-OBJS+= file.o
-endif
-ifeq ($(CONFIG_NETWORK),yes)
-OBJS+= udp.o tcp.o http.o rtsp.o rtp.o rtpproto.o mpegts.o rtp_h264.o
-endif
+OBJS-$(CONFIG_PROTOCOLS)                 += file.o
+OBJS-$(CONFIG_NETWORK)                   += udp.o tcp.o http.o rtsp.o rtp.o \
+                                            rtpproto.o mpegts.o rtp_h264.o
 
 NAME=avformat
 LIBVERSION=$(LAVFVERSION)