[gegl] build: Merge CPPFLAGS

[Mukund Sivaraman <muks src gnome org>]

commit e0737ce4590288f096d9195d70402a732839164f
Author: Mukund Sivaraman <muks banu com>
Date:   Thu Jan 15 09:01:06 2015 +0530

    build: Merge CPPFLAGS

 perf/Makefile.am |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/perf/Makefile.am b/perf/Makefile.am
index 87f6476..b7d4eb7 100644
--- a/perf/Makefile.am
+++ b/perf/Makefile.am
@@ -9,7 +9,7 @@ noinst_PROGRAMS = \
        test-samplers \
        test-rotate
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)/ \
        -I$(top_srcdir)/gegl/ \
        -I$(top_srcdir)/gegl/buffer \
@@ -17,19 +17,17 @@ INCLUDES = \
        -I$(top_srcdir)/gegl/graph \
        -I$(top_srcdir)/gegl/process \
        -I$(top_srcdir)/gegl/property-types \
-       -I$(top_builddir)/gegl
-
-common_ldadd = $(top_builddir)/gegl/libgegl- GEGL_API_VERSION@.la
-
-LDADD = $(common_ldadd) $(DEP_LIBS) $(BABL_LIBS) -lm
-
-AM_CFLAGS = \
-       $(DEP_CFLAGS) $(BABL_CFLAGS)\
+       -I$(top_builddir)/gegl \
+       $(DEP_CFLAGS) $(BABL_CFLAGS) \
        -DG_DISABLE_SINGLE_INCLUDES \
        -DGLIB_DISABLE_DEPRECATION_WARNINGS \
        -DCLUTTER_DISABLE_DEPRECATION_WARNINGS \
        -DTESTS_DATA_DIR=\""$(top_srcdir)/tests/data/"\"
 
+common_ldadd = $(top_builddir)/gegl/libgegl- GEGL_API_VERSION@.la
+
+LDADD = $(common_ldadd) $(DEP_LIBS) $(BABL_LIBS) -lm
+
 perf-report: check
 
 check: