From 1db54e20ff5a02e49bb59e3337c141a077bebf08 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Mon, 10 Jul 2006 00:49:16 +0000 Subject: [PATCH] Move gprof compiler flag handling to configure. Originally committed as revision 5701 to svn://svn.ffmpeg.org/ffmpeg/trunk --- Makefile | 5 ----- common.mak | 5 ----- configure | 6 +++++- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index cd42721323..9dc3982cc1 100644 --- a/Makefile +++ b/Makefile @@ -11,11 +11,6 @@ CFLAGS=$(OPTFLAGS) -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil \ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE LDFLAGS+= -g -ifeq ($(TARGET_GPROF),yes) -CFLAGS+=-p -LDFLAGS+=-p -endif - MANPAGES=doc/ffmpeg.1 PROGS_G+=ffmpeg_g$(EXESUF) PROGS+=ffmpeg$(EXESUF) diff --git a/common.mak b/common.mak index cdafa60ae8..36f2377c61 100644 --- a/common.mak +++ b/common.mak @@ -5,11 +5,6 @@ SRC_DIR = $(SRC_PATH)/lib$(NAME) VPATH = $(SRC_DIR) -ifeq ($(TARGET_GPROF),yes) -CFLAGS+=-p -LDFLAGS+=-p -endif - SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) $(CPPOBJS:.o=.cpp) OBJS := $(OBJS) $(ASM_OBJS) $(CPPOBJS) STATIC_OBJS := $(OBJS) $(STATIC_OBJS) diff --git a/configure b/configure index 0075250436..36ffcf0a83 100755 --- a/configure +++ b/configure @@ -1448,6 +1448,11 @@ if test "$lshared" = "yes" ; then fi fi +if test "$gprof" = "yes" ; then + CFLAGS="$CFLAGS -p" + LDFLAGS="$LDFLAGS -p" +fi + if test x"$bindir" = x""; then bindir="${prefix}/bin" fi @@ -1680,7 +1685,6 @@ if test "$altivec" = "yes" ; then fi fi if test "$gprof" = "yes" ; then - echo "TARGET_GPROF=yes" >> config.mak echo "#define HAVE_GPROF 1" >> $TMPH fi if test "$localtime_r" = "yes" ; then