diff options
| author | j@v2v.cc <j@v2v.cc> | 2005-10-04 11:19:08 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2005-10-04 11:19:08 +0000 |
| commit | c99dd23307e68b4a6ad9ccd99d7fa2975438223d (patch) | |
| tree | 07140ed1c153d6060668e950ddfc8b9639e5f725 /libavcodec/Makefile | |
| parent | 5af837972c6583ae3f500b047b451dad7d3e64be (diff) | |
| download | ffmpeg-c99dd23307e68b4a6ad9ccd99d7fa2975438223d.tar.gz | |
Move all definitions of external dependencies into configure instead of
defining it in configure and the Makefiles in a random fashion.
patch by j -- at -- v2v -- dot -- cc
Originally committed as revision 4628 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 9e643675b7..bfae541195 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -240,32 +240,22 @@ EXTRALIBS += -L../libavutil -lavutil$(BUILDSUF) # currently using libdts for dts decoding ifeq ($(CONFIG_DTS),yes) OBJS+= dtsdec.o -CFLAGS += $(DTS_INC) -EXTRALIBS += -ldts endif ifeq ($(CONFIG_FAAD),yes) OBJS+= faad.o -ifeq ($(CONFIG_FAADBIN),yes) -# no libs needed -else -EXTRALIBS += -lfaad -endif endif ifeq ($(CONFIG_FAAC),yes) OBJS+= faac.o -EXTRALIBS += -lfaac endif ifeq ($(CONFIG_XVID),yes) OBJS+= xvidff.o -EXTRALIBS += -lxvidcore endif ifeq ($(CONFIG_X264),yes) OBJS+= x264.o -EXTRALIBS += -lx264 endif ifeq ($(CONFIG_PP),yes) @@ -279,24 +269,19 @@ endif ifeq ($(CONFIG_MP3LAME),yes) OBJS += mp3lameaudio.o -EXTRALIBS += -lmp3lame endif ifeq ($(CONFIG_LIBOGG),yes) ifeq ($(CONFIG_LIBVORBIS),yes) OBJS += oggvorbis.o -EXTRALIBS += -lvorbisenc -lvorbis endif ifeq ($(CONFIG_LIBTHEORA), yes) OBJS += oggtheora.o -EXTRALIBS += -ltheora endif -EXTRALIBS += -logg endif ifeq ($(CONFIG_LIBGSM),yes) OBJS += libgsm.o -EXTRALIBS += -lgsm endif ifeq ($(TARGET_GPROF),yes) |