Move gprof compiler flag handling to configure.

Originally committed as revision 5701 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/Makefile b/Makefile
index cd42721323af0d8d09404d14e8a515fd63347b92..9dc3982cc1f541950bf2f798d704f86bf64ef27e 100644 (file)
--- 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 cdafa60ae859155db70c5373c7ac98b8ca28ccaa..36f2377c61bc782389375a38c36c7861df8aca43 100644 (file)
--- 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 00752504366efb6239636d170be85f0310664e54..36ffcf0a8381bd3684121f4a2f17eef02686f141 100755 (executable)
--- 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