diff options
| author | Diego Biurrun <diego@biurrun.de> | 2007-04-03 16:33:04 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-04-03 16:33:04 +0000 |
| commit | 7b17ad84be20f82d4bd4bfed63d15e066a5b1b6a (patch) | |
| tree | dfe92b1932203f3922934bdbf1766a72d4507f34 | |
| parent | 2d93bcc784e6e99b074e4be1fe1fca12708cfdf2 (diff) | |
| download | ffmpeg-7b17ad84be20f82d4bd4bfed63d15e066a5b1b6a.tar.gz | |
Get rid of unnecessary conditionals.
Originally committed as revision 8617 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/Makefile | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index fc289a3b31..3d12752c22 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -155,19 +155,14 @@ endif 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) |