gtkglarea r100 - in trunk: . examples gtkgl

[samh svn gnome org]

Author: samh
Date: Fri Mar  7 13:06:18 2008
New Revision: 100
URL: http://svn.gnome.org/viewvc/gtkglarea?rev=100&view=rev

Log:
  * Build with -Wall by default.
  * Replace BASE_DEPENDENCIES_* with GTK_* for better readability.


Modified:
   trunk/configure.ac
   trunk/examples/Makefile.am
   trunk/gtkgl/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Mar  7 13:06:18 2008
@@ -57,10 +57,10 @@
 dnl  Check for GTK libraries
 dnl
 GTK_REQUIRED_VERSION=2.0.0
-PKG_CHECK_MODULES(BASE_DEPENDENCIES, gtk+-2.0 >= $GTK_REQUIRED_VERSION gmodule-2.0 >= $GTK_REQUIRED_VERSION)
+PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION gmodule-2.0 >= $GTK_REQUIRED_VERSION)
 
-AC_SUBST(BASE_DEPENDENCIES_CFLAGS)
-AC_SUBST(BASE_DEPENDENCIES_LIBS)
+AC_SUBST(GTK_CFLAGS)
+AC_SUBST(GTK_LIBS)
 
 dnl
 dnl  Check for the windowing system (X11 or Win32)
@@ -89,9 +89,9 @@
 saved_LIBS="$LIBS"
 
 AC_MSG_CHECKING([OpenGL])
-LIBS="$saved_LIBS $BASE_DEPENDENCIES_LIBS $GL_LDOPTS -lGL"
+LIBS="$saved_LIBS $GTK_LIBS $GL_LDOPTS -lGL"
 AC_TRY_LINK( ,[ char glBegin(); glBegin(); ], have_GL=yes, 
-  LIBS="$saved_LIBS $BASE_DEPENDENCIES_LIBS $GL_LDOPTS -lopengl32"
+  LIBS="$saved_LIBS $GTK_LIBS $GL_LDOPTS -lopengl32"
   [AC_TRY_LINK([ #include <windows.h>
                  #include <GL/gl.h>], 
                [ glBegin(GL_TRIANGLES); ], 
@@ -101,13 +101,13 @@
 AC_MSG_RESULT($have_GL)
 
 AC_MSG_CHECKING([Mesa])
-LIBS="$saved_LIBS $BASE_DEPENDENCIES_LIBS $GL_LDOPTS -lMesaGL"
+LIBS="$saved_LIBS $GTK_LIBS $GL_LDOPTS -lMesaGL"
 AC_TRY_LINK( ,[ char glBegin(); glBegin(); ], have_MesaGL=yes, have_MesaGL=no)
 AC_MSG_RESULT($have_MesaGL)
 
 if test "x$have_MesaGL" = "xno"; then
  AC_MSG_CHECKING([Mesa with pthreads])
- LIBS="$saved_LIBS $BASE_DEPENDENCIES_LIBS $GL_LDOPTS -lMesaGL -lpthread"
+ LIBS="$saved_LIBS $GTK_LIBS $GL_LDOPTS -lMesaGL -lpthread"
  AC_TRY_LINK( ,[ char glBegin(); glBegin(); ], have_MesaGL_pthread=yes, have_MesaGL_pthread=no)
  AC_MSG_RESULT($have_MesaGL_pthread)
 fi
@@ -158,7 +158,7 @@
 
 saved_LIBS="$LIBS"
 AC_MSG_CHECKING([OpenGL shaders])
-LIBS="$saved_LIBS $BASE_DEPENDENCIES_LIBS $GL_LDOPTS $GL_LIBS"
+LIBS="$saved_LIBS $GTK_LIBS $GL_LDOPTS $GL_LIBS"
 AC_TRY_LINK( ,[ char glCreateProgram(); glCreateProgram(); ],
             have_shaders=yes, have_shaders=no)
 AC_MSG_RESULT($have_shaders)
@@ -168,7 +168,8 @@
 AC_SUBST(GL_CFLAGS)
 AC_SUBST(GL_LIBS)
 
-CFLAGS="$CFLAGS $BASE_DEPENDENCIES_CFLAGS $GL_CFLAGS"
+CFLAGS="$CFLAGS $GTK_CFLAGS $GL_CFLAGS"
+CFLAGS="$CFLAGS -Wall"
 
 dnl Checks for header files.
 AC_HEADER_STDC

Modified: trunk/examples/Makefile.am
==============================================================================
--- trunk/examples/Makefile.am	(original)
+++ trunk/examples/Makefile.am	Fri Mar  7 13:06:18 2008
@@ -9,7 +9,7 @@
 noinst_PROGRAMS = simple zktor viewlw glpixmap gdkfont $(shader_programs) gtkglarea_demo
 
 INCLUDES = -I$(top_srcdir)
-LDADD = $(top_builddir)/gtkgl/libgtkgl-2.0.la $(BASE_DEPENDENCIES_LIBS) $(GL_LIBS)
+LDADD = $(top_builddir)/gtkgl/libgtkgl-2.0.la $(GTK_LIBS) $(GL_LIBS)
 
 simple_SOURCES   = simple.c
 zktor_SOURCES    = zktor.c

Modified: trunk/gtkgl/Makefile.am
==============================================================================
--- trunk/gtkgl/Makefile.am	(original)
+++ trunk/gtkgl/Makefile.am	Fri Mar  7 13:06:18 2008
@@ -27,7 +27,7 @@
 
 EXTRA_DIST = makefile.mingw makefile.mingw.in gtkgl.def
 
-AM_CFLAGS = $(BASE_DEPENDENCIES_CFLAGS) $(GL_CFLAGS)
+AM_CFLAGS = $(GTK_CFLAGS) $(GL_CFLAGS)
 INCLUDES= -I$(top_srcdir)
 
 gtkglincludedir = $(includedir)/gtkgl-2.0/gtkgl
@@ -37,7 +37,7 @@
 gtkglinclude_HEADERS= gdkgl.h gtkglarea.h
 libgtkgl_2_0_la_SOURCES = gdkgl.c gtkglarea.c
 libgtkgl_2_0_la_LDFLAGS = -version-info $(GTKGL_LIBRARY_VERSION) $(export_symbols) -no-undefined
-libgtkgl_2_0_la_LIBADD = $(BASE_DEPENDENCIES_LIBS) $(GL_LIBS)
+libgtkgl_2_0_la_LIBADD = $(GTK_LIBS) $(GL_LIBS)
 
 gtkgl-2.0.lib: libgtkgl-2.0.la gtkgl.def
 	lib -name:libgtkgl-2 0- LT_CURRENT_MINUS_AGE@.dll -def:gtkgl.def -out:$@