From e72f48c19f40a5e390f205396c47f94432d48033 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 18 Mar 2007 22:11:32 +0000
Subject: [PATCH] Merge CFLAGS lines.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22732 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 mpcommon.mak | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mpcommon.mak b/mpcommon.mak
index a35f017c2a..4d37c46bbb 100644
--- a/mpcommon.mak
+++ b/mpcommon.mak
@@ -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)