summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorj@v2v.cc <j@v2v.cc>2005-10-04 11:19:08 +0000
committerDiego Biurrun <diego@biurrun.de>2005-10-04 11:19:08 +0000
commitc99dd23307e68b4a6ad9ccd99d7fa2975438223d (patch)
tree07140ed1c153d6060668e950ddfc8b9639e5f725 /Makefile
parent5af837972c6583ae3f500b047b451dad7d3e64be (diff)
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 'Makefile')
-rw-r--r--Makefile37
1 files changed, 0 insertions, 37 deletions
diff --git a/Makefile b/Makefile
index df3d5ec8db..5aca852cf9 100644
--- a/Makefile
+++ b/Makefile
@@ -38,43 +38,6 @@ ifeq ($(BUILD_SHARED),yes)
DEP_LIBS=libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF)
else
DEP_LIBS=libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF)
-ifeq ($(CONFIG_MP3LAME),yes)
-EXTRALIBS+=-lmp3lame
-endif
-endif
-
-ifeq ($(CONFIG_LIBOGG),yes)
-ifeq ($(CONFIG_LIBVORBIS),yes)
-EXTRALIBS+= -lvorbisenc -lvorbis
-endif
-ifeq ($(CONFIG_LIBTHEORA),yes)
-EXTRALIBS+= -ltheora
-endif
-EXTRALIBS+= -logg
-endif
-
-ifeq ($(CONFIG_FAAD),yes)
-ifeq ($(CONFIG_FAADBIN),yes)
-# no libs needed
-else
-EXTRALIBS += -lfaad
-endif
-endif
-
-ifeq ($(CONFIG_FAAC),yes)
-EXTRALIBS+=-lfaac
-endif
-
-ifeq ($(CONFIG_XVID),yes)
-EXTRALIBS+=-lxvidcore
-endif
-
-ifeq ($(CONFIG_LIBGSM),yes)
-EXTRALIBS+=-lgsm
-endif
-
-ifeq ($(CONFIG_DC1394),yes)
-EXTRALIBS+=-ldc1394_control -lraw1394
endif
ifeq ($(BUILD_VHOOK),yes)