Mercurial > mplayer.hg

changeset 26567:12dc7032ced3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move CFLAGS setting to configure.
author diego
date Tue, 29 Apr 2008 22:27:50 +0000
parents 351cc64042c1
children 70bfc423dd45
files Makefile configure
diffstat 2 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Tue Apr 29 17:54:54 2008 +0000
+++ b/Makefile	Tue Apr 29 22:27:50 2008 +0000
@@ -636,8 +636,6 @@
 OBJS_MENCODER  += $(addsuffix .o, $(basename $(SRCS_MENCODER)) )
 OBJS_MPLAYER   += $(addsuffix .o, $(basename $(SRCS_MPLAYER)) )
 
-CFLAGS += $(CFLAGS-yes) $(OPTFLAGS)
-
 INSTALL_TARGETS-$(MPLAYER)  += install-mplayer  install-mplayer-man
 INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mplayer-man
 INSTALL_TARGETS-$(GUI)      += install-gui
--- a/configure	Tue Apr 29 17:54:54 2008 +0000
+++ b/configure	Tue Apr 29 22:27:50 2008 +0000
@@ -7696,6 +7696,7 @@
 INSTALL = $_install
 EXTRA_INC = $_inc_extra
 EXTRAXX_INC = $_inc_extra $_inc_extraxx
+CFLAGS = $CFLAGS \$(EXTRA_INC)
 OPTFLAGS = $CFLAGS \$(EXTRA_INC)
 CFLAG_NO_OMIT_LEAF_FRAME_POINTER = $CFLAG_NO_OMIT_LEAF_FRAME_POINTER
 CXXFLAGS = $CXXFLAGS \$(EXTRAXX_INC)