summaryrefslogtreecommitdiffstats
path: root/mpcommon.mak
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-03-18 22:11:32 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-03-18 22:11:32 +0000
commite72f48c19f40a5e390f205396c47f94432d48033 (patch)
tree880b16532f792f8cffaadf87196665b6cbba1076 /mpcommon.mak
parent132dd09be9dfc19c7dfaf9cfd391eaf7cf07f6ca (diff)
downloadmpv-e72f48c19f40a5e390f205396c47f94432d48033.tar.bz2
mpv-e72f48c19f40a5e390f205396c47f94432d48033.tar.xz
Merge CFLAGS lines.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22732 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mpcommon.mak')
-rw-r--r--mpcommon.mak3
1 files changed, 1 insertions, 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)