Mercurial > mplayer.hg

diff Makefile @ 22793:0813069ea278

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
libavutil/ is not optional, compile it unconditionally.
author diego
date Sat, 24 Mar 2007 19:40:32 +0000
parents d1e8f85138e7
children 0285c5f0f53d
line wrap: on
line diff
--- a/Makefile	Sat Mar 24 19:29:55 2007 +0000
+++ b/Makefile	Sat Mar 24 19:40:32 2007 +0000
@@ -6,9 +6,8 @@
 
 include config.mak
 
-CFLAGS = -I. $(OPTFLAGS)
+CFLAGS = -I. -I./libavutil $(OPTFLAGS)
 
-CFLAGS-$(CONFIG_LIBAVUTIL)  += -I./libavutil
 CFLAGS-$(CONFIG_LIBAVCODEC) += -I./libavcodec
 CFLAGS                      += $(CFLAGS-yes)
 
@@ -57,6 +56,7 @@
               libaf/libaf.a \
               libmpdemux/libmpdemux.a \
               stream/stream.a \
+              libavutil/libavutil.a \
               libswscale/libswscale.a \
               libvo/libosd.a \
 
@@ -85,8 +85,6 @@
 PARTS-$(CONFIG_LIBAVFORMAT)       += libavformat
 COMMON_LIBS-$(CONFIG_LIBAVCODEC)  += libavcodec/libavcodec.a
 PARTS-$(CONFIG_LIBAVCODEC)        += libavcodec
-COMMON_LIBS-$(CONFIG_LIBAVUTIL)   += libavutil/libavutil.a
-PARTS-$(CONFIG_LIBAVUTIL)         += libavutil
 COMMON_LIBS-$(CONFIG_LIBPOSTPROC) += libpostproc/libpostproc.a
 PARTS-$(CONFIG_LIBPOSTPROC)       += libpostproc
 COMMON_LIBS-$(WIN32DLL)           += loader/libloader.a