From 94b35a4a5ee4fa86d837b2deb06fe849a2a68977 Mon Sep 17 00:00:00 2001 From: Damien Lespiau Date: Mon, 3 Aug 2009 13:56:32 +0100 Subject: [PATCH] [build] GCC_FLAGS is no more, MAINTAINER_CFLAGS is the One. CC_FLAGS was a left over from the 0.8.x age. Killed it and use the newer MAINTAINER_CFLAGS variable instead. --- clutter/Makefile.am | 2 +- clutter/eglnative/Makefile.am | 2 +- clutter/eglx/Makefile.am | 2 +- clutter/fruity/Makefile.am | 2 +- clutter/glx/Makefile.am | 3 +-- clutter/json/Makefile.am | 2 ++ clutter/osx/Makefile.am | 2 +- clutter/sdl/Makefile.am | 2 +- clutter/win32/Makefile.am | 2 +- clutter/x11/Makefile.am | 3 +-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/clutter/Makefile.am b/clutter/Makefile.am index fc0fa2ef5..6c2cda306 100644 --- a/clutter/Makefile.am +++ b/clutter/Makefile.am @@ -37,7 +37,7 @@ INCLUDES = \ $(CLUTTER_CFLAGS) \ $(NULL) -AM_CFLAGS = $(GCC_FLAGS) $(CLUTTER_DEBUG_CFLAGS) $(MAINTAINER_CFLAGS) +AM_CFLAGS = $(CLUTTER_DEBUG_CFLAGS) $(MAINTAINER_CFLAGS) LDADD = \ $(CLUTTER_LT_LDFLAGS) \ diff --git a/clutter/eglnative/Makefile.am b/clutter/eglnative/Makefile.am index c3773cc40..ae8b2a9f6 100644 --- a/clutter/eglnative/Makefile.am +++ b/clutter/eglnative/Makefile.am @@ -9,7 +9,7 @@ INCLUDES = \ -I$(top_builddir)/clutter \ $(CLUTTER_CFLAGS) \ $(CLUTTER_DEBUG_CFLAGS) \ - $(GCC_FLAGS) + $(MAINTAINER_CFLAGS) LDADD = $(CLUTTER_LIBS) diff --git a/clutter/eglx/Makefile.am b/clutter/eglx/Makefile.am index 329dc9041..8c05ce4ea 100644 --- a/clutter/eglx/Makefile.am +++ b/clutter/eglx/Makefile.am @@ -10,7 +10,7 @@ INCLUDES = \ -I$(top_builddir)/clutter \ $(CLUTTER_CFLAGS) \ $(CLUTTER_DEBUG_CFLAGS) \ - $(GCC_FLAGS) + $(MAINTAINER_CFLAGS) LDADD = $(CLUTTER_LIBS) $(top_builddir)/clutter/x11/libclutter-x11.la diff --git a/clutter/fruity/Makefile.am b/clutter/fruity/Makefile.am index 7f4d8ec25..6ca82de05 100644 --- a/clutter/fruity/Makefile.am +++ b/clutter/fruity/Makefile.am @@ -7,7 +7,7 @@ INCLUDES = \ -I$(top_srcdir)/clutter \ $(CLUTTER_CFLAGS) \ $(CLUTTER_DEBUG_CFLAGS) \ - $(GCC_FLAGS) \ + $(MAINTAINER_CFLAGS) \ -xobjective-c LDADD = $(CLUTTER_LIBS) diff --git a/clutter/glx/Makefile.am b/clutter/glx/Makefile.am index 5223bc867..e2a8dc921 100644 --- a/clutter/glx/Makefile.am +++ b/clutter/glx/Makefile.am @@ -10,8 +10,7 @@ INCLUDES = \ -DCLUTTER_COMPILATION \ $(CLUTTER_CFLAGS) \ $(CLUTTER_DEBUG_CFLAGS) \ - $(MAINTAINER_CFLAGS) \ - $(GCC_FLAGS) + $(MAINTAINER_CFLAGS) LDADD = $(CLUTTER_LIBS) $(top_builddir)/clutter/x11/libclutter-x11.la diff --git a/clutter/json/Makefile.am b/clutter/json/Makefile.am index 06d03168b..0804658b5 100644 --- a/clutter/json/Makefile.am +++ b/clutter/json/Makefile.am @@ -27,6 +27,8 @@ INCLUDES = \ -DG_LOG_DOMAIN=\"Clutter-Json\" \ -DG_DISABLE_DEPRECATED +AM_CFLAGS = $(MAINTAINER_CFLAGS) + clutterjsondir = $(includedir)/clutter-@CLUTTER_MAJORMINOR@/clutter/json clutterjson_HEADERS = $(source_h) diff --git a/clutter/osx/Makefile.am b/clutter/osx/Makefile.am index 762e1a75c..82d282d38 100644 --- a/clutter/osx/Makefile.am +++ b/clutter/osx/Makefile.am @@ -9,7 +9,7 @@ INCLUDES = \ -I$(top_builddir)/clutter \ $(CLUTTER_CFLAGS) \ $(CLUTTER_DEBUG_CFLAGS) \ - $(GCC_FLAGS) \ + $(MAINTAINER_CFLAGS) -xobjective-c LDADD = $(CLUTTER_LIBS) diff --git a/clutter/sdl/Makefile.am b/clutter/sdl/Makefile.am index 787bd623a..92d1b1f55 100644 --- a/clutter/sdl/Makefile.am +++ b/clutter/sdl/Makefile.am @@ -9,7 +9,7 @@ INCLUDES = \ -I$(top_builddir)/clutter/ \ $(CLUTTER_CFLAGS) \ $(CLUTTER_DEBUG_CFLAGS) \ - $(GCC_FLAGS) + $(MAINTAINER_CFLAGS) LDADD = $(CLUTTER_LIBS) diff --git a/clutter/win32/Makefile.am b/clutter/win32/Makefile.am index 4cfff8ac0..d4fa60cb1 100644 --- a/clutter/win32/Makefile.am +++ b/clutter/win32/Makefile.am @@ -15,7 +15,7 @@ INCLUDES = \ -I$(top_builddir)/clutter \ $(CLUTTER_CFLAGS) \ $(CLUTTER_DEBUG_CFLAGS) \ - $(GCC_FLAGS) + $(MAINTAINER_CFLAGS) LDADD = $(CLUTTER_LIBS) diff --git a/clutter/x11/Makefile.am b/clutter/x11/Makefile.am index 1b772609b..07d2ddc29 100644 --- a/clutter/x11/Makefile.am +++ b/clutter/x11/Makefile.am @@ -6,8 +6,7 @@ INCLUDES = \ -I$(top_builddir)/clutter \ $(CLUTTER_CFLAGS) \ $(CLUTTER_DEBUG_CFLAGS) \ - $(MAINTAINER_CFLAGS) \ - $(GCC_FLAGS) + $(MAINTAINER_CFLAGS) LDADD = $(CLUTTER_LIBS)