[MPlayer-cvslog] r22811 - in trunk: Makefile mpcommon.mak

[diego]

Author: diego
Date: Sat Mar 24 20:40:32 2007
New Revision: 22811

Modified:
   trunk/Makefile
   trunk/mpcommon.mak

Log:
libavutil/ is not optional, compile it unconditionally.


Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Sat Mar 24 20:40:32 2007
@@ -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 @@ COMMON_LIBS = libmpcodecs/libmpcodecs.a 
               libaf/libaf.a \
               libmpdemux/libmpdemux.a \
               stream/stream.a \
+              libavutil/libavutil.a \
               libswscale/libswscale.a \
               libvo/libosd.a \
 
@@ -85,8 +85,6 @@ COMMON_LIBS-$(CONFIG_LIBAVFORMAT) += lib
 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

Modified: trunk/mpcommon.mak
==============================================================================
--- trunk/mpcommon.mak	(original)
+++ trunk/mpcommon.mak	Sat Mar 24 20:40:32 2007
@@ -6,10 +6,9 @@ OBJS_COMMON    = $(addsuffix .o, $(basen
 OBJS_MPLAYER   = $(addsuffix .o, $(basename $(SRCS_MPLAYER)) )
 OBJS_MENCODER  = $(addsuffix .o, $(basename $(SRCS_MENCODER)) )
 
-CFLAGS-$(CONFIG_LIBAVUTIL)      += -I../libavutil
 CFLAGS-$(CONFIG_LIBAVCODEC)     += -I../libavcodec
 CFLAGS-$(CONFIG_LIBAVFORMAT)    += -I../libavformat
-CFLAGS += -I. -I.. $(CFLAGS-yes) $(OPTFLAGS)
+CFLAGS += -I. -I.. -I../libavutil $(CFLAGS-yes) $(OPTFLAGS)
 
 LIBS-$(MPLAYER)  += $(LIBNAME_MPLAYER)
 LIBS-$(MENCODER) += $(LIBNAME_MENCODER)