[grits] Fix compile with glut
- From: Andy Spencer <andys src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [grits] Fix compile with glut
- Date: Sat, 2 Jun 2012 22:27:13 +0000 (UTC)
commit a7a18dea466fb0b38ff21dc0e86617399a5072c0
Author: Andy Spencer <andy753421 gmail com>
Date: Wed May 23 04:38:20 2012 +0000
Fix compile with glut
src/plugins/Makefile.am | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 7c087a1..5fc085d 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -21,14 +21,17 @@ map_la_SOURCES = map.c map.h
env_la_SOURCES = env.c env.h
test_la_SOURCES = test.c test.h
+env_la_CPPFLAGS = $(AM_CPPFLAGS)
+env_la_LDFLAGS = $(AM_LDFLAGS)
+
if HAVE_GLUT
noinst_LTLIBRARIES = teapot.la
teapot_la_SOURCES = \
$(top_srcdir)/examples/plugin/teapot.c \
$(top_srcdir)/examples/plugin/teapot.h
teapot_la_LDFLAGS = $(AM_LDFLAGS) -lglut -rpath $(libdir) # I hate you libtool
-env_la_CPPFLAGS = $(AM_CPPFLAGS) -DHAVE_GLUT
-env_la_LDFLAGS = $(AM_LDFLAGS) -lglut
+env_la_CPPFLAGS += -DHAVE_GLUT
+env_la_LDFLAGS += -lglut
endif
test:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]