[frogr] Handle extra compilation flags in a better way.

[Mario Sanchez Prada <msanchez src gnome org>]

commit 4ae22940baec18775b7af0d723a220df08b31edd
Author: Mario Sanchez Prada <msanchez igalia com>
Date:   Thu May 5 09:45:26 2011 +0200

    Handle extra compilation flags in a better way.
    
    Also, removed the unneeded EXTRA_CFLAGS variable in configure.ac

 configure.ac              |    9 ++-------
 src/Makefile.am           |    1 -
 src/flicksoup/Makefile.am |    3 +--
 3 files changed, 3 insertions(+), 10 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d230f71..25c7af8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,8 +29,6 @@ PKG_CHECK_MODULES(EXIF, libexif >= $EXIF_MIN_VERSION)
 FROGR_CFLAGS="$FROGR_CFLAGS $EXIF_CFLAGS"
 FROGR_LIBS="$FROGR_LIBS $EXIF_LIBS"
 
-# Extra checks for flicksoup internal library
-
 LIBSOUP_MIN_VERSION=2.24
 PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4 >= $LIBSOUP_MIN_VERSION)
 FROGR_CFLAGS="$FROGR_CFLAGS $LIBSOUP_CFLAGS"
@@ -119,11 +117,9 @@ AC_MSG_RESULT([$enable_debug])
 
 if test "x$enable_debug" = "xyes"; then
    AC_DEFINE([DEBUG_ENABLED], [1], [Debug enabled])
-   FROGR_CFLAGS="$FROGR_CFLAGS -DG_ENABLE_DEBUG -DG_ERRORCHECK_MUTEXES"
-   EXTRA_CFLAGS="-Wall -Werror -g3 -O0"
+   CFLAGS="$CFLAGS -DG_ENABLE_DEBUG -DG_ERRORCHECK_MUTEXES -Wall -Werror -g3 -O0"
 else
-   FROGR_CFLAGS="$FROGR_CFLAGS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS"
-   EXTRA_CFLAGS="-Wall -g0 -O2"
+   CFLAGS="$CFLAGS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS -Wall -g0 -O2"
 fi
 
 # Substitute
@@ -132,7 +128,6 @@ AC_SUBST(appdatadir, "\${datadir}/frogr")
 AC_SUBST(iconsdir, "\${datadir}/icons")
 AC_SUBST(FROGR_CFLAGS)
 AC_SUBST(FROGR_LIBS)
-AC_SUBST(EXTRA_CFLAGS)
 
 # Produce output files
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 613629e..e1f5efe 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,7 +27,6 @@ frogr_LDADD = 				\
 	$(FROGR_LIBS)
 
 frogr_CFLAGS = $(FROGR_CFLAGS) \
-	$(EXTRA_CFLAGS) \
 	-DAPP_DATA_DIR=\"$(appdatadir)\" \
 	-DICONS_DIR=\"$(iconsdir)\"
 
diff --git a/src/flicksoup/Makefile.am b/src/flicksoup/Makefile.am
index 1340358..8a608f4 100644
--- a/src/flicksoup/Makefile.am
+++ b/src/flicksoup/Makefile.am
@@ -15,8 +15,7 @@
 AM_CFLAGS =			  \
 	-I$(top_srcdir)/src 	  \
 	$(LIBSOUP_CFLAGS)	  \
-	$(LIBXML2_CFLAGS)	  \
-	$(EXTRA_CFLAGS)
+	$(LIBXML2_CFLAGS)
 
 noinst_LIBRARIES = libflicksoup.a