Mercurial > mplayer.hg

changeset 22714:97ad9cecc6d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge CFLAGS lines.
author diego
date Sun, 18 Mar 2007 22:11:32 +0000
parents 88b877974c8c
children 363c84953547
files mpcommon.mak
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mpcommon.mak	Sun Mar 18 21:58:28 2007 +0000
+++ b/mpcommon.mak	Sun Mar 18 22:11:32 2007 +0000
@@ -1,13 +1,12 @@
 SRCS_COMMON          += $(SRCS_COMMON-yes)
 SRCS_MPLAYER         += $(SRCS_MPLAYER-yes)
 SRCS_MENCODER        += $(SRCS_MENCODER-yes)
-CFLAGS       += $(CFLAGS-yes)
 
 OBJS_COMMON    = $(addsuffix .o, $(basename $(SRCS_COMMON)) )
 OBJS_MPLAYER   = $(addsuffix .o, $(basename $(SRCS_MPLAYER)) )
 OBJS_MENCODER  = $(addsuffix .o, $(basename $(SRCS_MENCODER)) )
 
-CFLAGS += -I. -I.. $(OPTFLAGS)
+CFLAGS += $(CFLAGS-yes) -I. -I.. $(OPTFLAGS)
 
 LIBS-$(MPLAYER)  += $(LIBNAME_MPLAYER)
 LIBS-$(MENCODER) += $(LIBNAME_MENCODER)