Move OpenGL includes to a common place

[grits] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 66e57185d75ea38ce5738ac13487e4ab6597d589..ed3db864219340946ccdcd2cb895b007a7b59768 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,6 +17,7 @@ grits_include_HEADERS = \
        grits-opengl.h  \
        grits-plugin.h  \
        grits-util.h    \
+       gtkgl.h         \
        gpqueue.h       \
        roam.h
 
@@ -40,7 +41,7 @@ libgrits_la_SOURCES = grits.h \
 libgrits_la_CPPFLAGS = $(AM_CPPFLAGS) \
        -DPKGDATADIR="\"$(dots)$(datadir)/$(GRITS_SUBDIR)\"" \
        -DPLUGINSDIR="\"$(dots)$(libdir)/$(GRITS_SUBDIR)\""
-libgrits_la_LIBADD  = $(AM_LDADD) \
+libgrits_la_LIBADD  = $(AM_LDADD) -lm \
        objects/libgrits-objects.la \
        data/libgrits-data.la
 libgrits_la_LDFLAGS = $(AM_LDFLAGS) \
@@ -49,7 +50,7 @@ libgrits_la_LDFLAGS = $(AM_LDFLAGS) \
 # Demo program
 if WIN32
 AM_CPPFLAGS += -DUSE_WGL
-AM_LDFLAGS  += -mwindows
+AM_LDFLAGS  += -mwindows -no-undefined
 dots         = ..
 else
 AM_CPPFLAGS += -DUSE_GLX
@@ -98,5 +99,5 @@ memcheck: all
                 --num-callers=50               \
                 --suppressions=gtk.suppression \
                 --suppressions=/usr/lib/valgrind/default.supp \
-                ./grits-test                   \
+                .libs/grits-test               \
        2> valgrind.out