Author: diego Date: Wed Apr 30 00:27:50 2008 New Revision: 26599 Log: Move CFLAGS setting to configure. Modified: trunk/Makefile trunk/configure Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Wed Apr 30 00:27:50 2008 @@ -636,8 +636,6 @@ OBJS_COMMON += $(addsuffix .o, $(base 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 Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Wed Apr 30 00:27:50 2008 @@ -7696,6 +7696,7 @@ WINDRES = $_windres 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)