build: Clean up main Makefile.am

clutter/Makefile.am

@@ -21,6 +21,7 @@ CLEANFILES =
 DISTCLEANFILES =
 EXTRA_DIST =
 BUILT_SOURCES =
+
 INCLUDES = \
 	-I$(top_srcdir) 		\
 	-I$(top_srcdir)/clutter/cogl	\
@@ -28,6 +29,9 @@ INCLUDES = \
 	-I$(top_srcdir)/clutter		\
 	$(clutter_json_include)		\
 	-I$(top_builddir)/clutter	\
+	$(NULL)
+
+AM_CPPFLAGS = \
 	-DCLUTTER_PREFIX=\""$(prefix)"\"	\
 	-DCLUTTER_LIBDIR=\""$(libdir)"\"	\
 	-DCLUTTER_DATADIR=\""$(datadir)"\"	\
@@ -35,10 +39,9 @@ INCLUDES = \
 	-DG_DISABLE_DEPRECATED 			\
 	-DG_DISABLE_SINGLE_INCLUDES		\
 	-DG_LOG_DOMAIN=\"Clutter\" 		\
-	$(CLUTTER_CFLAGS) 				\
 	$(NULL)
 
-AM_CFLAGS = $(CLUTTER_DEBUG_CFLAGS) $(MAINTAINER_CFLAGS)
+AM_CFLAGS = $(CLUTTER_CFLAGS) $(CLUTTER_DEBUG_CFLAGS) $(MAINTAINER_CFLAGS)
 
 LDADD = \
 	$(CLUTTER_LT_LDFLAGS) \