[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec Makefile,1.202,1.203
Diego Biurrun CVS
diego
Tue Oct 4 13:19:10 CEST 2005
Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv15240/libavcodec
Modified Files:
Makefile
Log Message:
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
Index: Makefile
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/Makefile,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -d -r1.202 -r1.203
--- Makefile 26 Sep 2005 10:05:13 -0000 1.202
+++ Makefile 4 Oct 2005 11:19:07 -0000 1.203
@@ -240,32 +240,22 @@
# 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 @@
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)
More information about the ffmpeg-cvslog
mailing list