[gtkglarea] configure: Do not overwrite the user variable CFLAGS
- From: Javier Jardón <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkglarea] configure: Do not overwrite the user variable CFLAGS
- Date: Thu, 27 Feb 2014 03:33:58 +0000 (UTC)
commit 227072126d0585a929bc073a31aaaa9984c78cf9
Author: Javier Jardón <jjardon gnome org>
Date: Thu Feb 27 03:16:34 2014 +0000
configure: Do not overwrite the user variable CFLAGS
Also we are already setting this in gtkgl/Makefile.am:
AM_CFLAGS = $(GTK_CFLAGS) $(GL_CFLAGS)
configure.ac | 2 --
examples/Makefile.am | 1 +
2 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4f385a8..4ff1d49 100644
--- a/configure.ac
+++ b/configure.ac
@@ -177,8 +177,6 @@ AM_CONDITIONAL(HAVE_SHADERS, test "$have_shaders" = "yes")
AC_SUBST(GL_CFLAGS)
AC_SUBST(GL_LIBS)
-CFLAGS="$CFLAGS $GTK_CFLAGS $GL_CFLAGS"
-
AC_CONFIG_FILES([
Makefile
gtkgl-2.0.pc
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 665d375..c305f44 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -9,6 +9,7 @@ endif
noinst_PROGRAMS = simple zktor viewlw glpixmap gdkfont $(shader_programs) gtkglarea_demo
AM_CPPFLAGS = -I$(top_srcdir)
+AM_CFLAGS = $(GTK_CFLAGS) $(GL_CFLAGS)
LDADD = $(top_builddir)/gtkgl/libgtkgl-2.0.la $(GTK_LIBS) $(GL_LIBS) $(LIBM)
simple_SOURCES = simple.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]