comparison Makefile @ 1978:9beecb275bae libavformat

cosmetics: Put audio (de)muxer entries in alphabetical order.
author diego
date Tue, 03 Apr 2007 15:57:38 +0000
parents d9f583b39c7d
children 2169e9435f2a
comparison
equal deleted inserted replaced
1977:d9f583b39c7d 1978:9beecb275bae
20 OBJS-$(CONFIG_ASF_DEMUXER) += asf.o riff.o 20 OBJS-$(CONFIG_ASF_DEMUXER) += asf.o riff.o
21 OBJS-$(CONFIG_ASF_MUXER) += asf-enc.o riff.o 21 OBJS-$(CONFIG_ASF_MUXER) += asf-enc.o riff.o
22 OBJS-$(CONFIG_ASF_STREAM_MUXER) += asf-enc.o riff.o 22 OBJS-$(CONFIG_ASF_STREAM_MUXER) += asf-enc.o riff.o
23 OBJS-$(CONFIG_AU_DEMUXER) += au.o riff.o 23 OBJS-$(CONFIG_AU_DEMUXER) += au.o riff.o
24 OBJS-$(CONFIG_AU_MUXER) += au.o riff.o 24 OBJS-$(CONFIG_AU_MUXER) += au.o riff.o
25 OBJS-$(CONFIG_AUDIO_DEMUXER) += audio.o
26 OBJS-$(CONFIG_AUDIO_MUXER) += audio.o
25 OBJS-$(CONFIG_AVI_DEMUXER) += avidec.o riff.o 27 OBJS-$(CONFIG_AVI_DEMUXER) += avidec.o riff.o
26 OBJS-$(CONFIG_AVI_MUXER) += avienc.o riff.o 28 OBJS-$(CONFIG_AVI_MUXER) += avienc.o riff.o
27 OBJS-$(CONFIG_AVISYNTH) += avisynth.o 29 OBJS-$(CONFIG_AVISYNTH) += avisynth.o
28 OBJS-$(CONFIG_AVS_DEMUXER) += avs.o vocdec.o voc.o riff.o 30 OBJS-$(CONFIG_AVS_DEMUXER) += avs.o vocdec.o voc.o riff.o
29 OBJS-$(CONFIG_CRC_MUXER) += crc.o 31 OBJS-$(CONFIG_CRC_MUXER) += crc.o
148 150
149 ifeq ($(CONFIG_BKTR),yes) 151 ifeq ($(CONFIG_BKTR),yes)
150 OBJS-$(CONFIG_VIDEO_GRAB_DEVICE_DEMUXER) += grab_bktr.o 152 OBJS-$(CONFIG_VIDEO_GRAB_DEVICE_DEMUXER) += grab_bktr.o
151 endif 153 endif
152 154
153 OBJS-$(CONFIG_AUDIO_DEMUXER) += audio.o
154 OBJS-$(CONFIG_AUDIO_MUXER) += audio.o
155
156 EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) \ 155 EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) \
157 -lavcodec$(BUILDSUF) -L$(BUILD_ROOT)/libavcodec $(EXTRALIBS) 156 -lavcodec$(BUILDSUF) -L$(BUILD_ROOT)/libavcodec $(EXTRALIBS)
158 157
159 ifeq ($(CONFIG_AUDIO_BEOS),yes) 158 ifeq ($(CONFIG_AUDIO_BEOS),yes)
160 CPPOBJS+= beosaudio.o 159 CPPOBJS+= beosaudio.o