[Ffmpeg-cvslog] r5701 - in trunk: Makefile common.mak configure

[diego]

Author: diego
Date: Mon Jul 10 02:49:16 2006
New Revision: 5701

Modified:
   trunk/Makefile
   trunk/common.mak
   trunk/configure

Log:
Move gprof compiler flag handling to configure.


Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Mon Jul 10 02:49:16 2006
@@ -11,11 +11,6 @@
        -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)

Modified: trunk/common.mak
==============================================================================
--- trunk/common.mak	(original)
+++ trunk/common.mak	Mon Jul 10 02:49:16 2006
@@ -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)

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Mon Jul 10 02:49:16 2006
@@ -1448,6 +1448,11 @@
     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 @@
   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