build: Re-instate profile builds

The profiling support was broken - probably during the restructuring of
the build environment, but I'm too lazy to bisect that.

The fix is trivial, and everything works as it should.

diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index 0ba3e83..a5be708 100644 (file)
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -40,6 +40,7 @@ AM_CPPFLAGS = \
        -DG_DISABLE_SINGLE_INCLUDES             \
        -DG_LOG_DOMAIN=\"Clutter\"              \
        $(CLUTTER_DEBUG_CFLAGS)                 \
+       $(CLUTTER_PROFILE_CFLAGS)               \
        $(NULL)
 
 AM_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS) $(GCOV_CFLAGS)
@@ -594,6 +595,7 @@ lib_LTLIBRARIES += libclutter-@CLUTTER_SONAME_INFIX@-@CLUTTER_API_VERSION@.la
 
 libclutter_@CLUTTER_SONAME_INFIX@_@CLUTTER_API_VERSION@_la_LIBADD = \
        $(CLUTTER_LIBS) \
+       $(CLUTTER_PROFILE_LIBS) \
        $(top_builddir)/clutter/cogl/cogl/libclutter-cogl.la \
        $(top_builddir)/clutter/cogl/pango/libcoglpango.la
 

diff --git a/configure.ac b/configure.ac
index ebd93a9..665339a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -924,8 +924,8 @@ AS_CASE([$enable_profile],
           AS_IF([test "x$GCC" = "xyes"],
                 [
                   PKG_CHECK_MODULES([PROFILE_DEP], [uprof-0.3])
-                  CLUTTER_PROFILE_CFLAGS=" -DCLUTTER_ENABLE_PROFILE -DCOGL_ENABLE_PROFILE $PROFILE_DEP_CFLAGS"
-                  CLUTTER_PROFILE_LDFLAGS=" $PROFILE_DEP_LIBS"
+                  CLUTTER_PROFILE_CFLAGS="-DCLUTTER_ENABLE_PROFILE -DCOGL_ENABLE_PROFILE $PROFILE_DEP_CFLAGS"
+                  CLUTTER_PROFILE_LDFLAGS="$PROFILE_DEP_LIBS"
 
                   AS_IF([test "x$enable_debug" = "xyes"], [CLUTTER_PROFILE_CFLAGS+=" -DUPROF_DEBUG"])
                 ],