# HG changeset patch
# User diego
# Date 1175617984 0
# Node ID 5b1369c8bd369342b62c28b9196b43e5dc128279
# Parent  2169e9435f2a4dcfcbcb1d6b79ff075f54eca1ab
Get rid of unnecessary conditionals.

diff -r 2169e9435f2a -r 5b1369c8bd36 Makefile
--- 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)