https://svn.lrde.epita.fr/svn/oln/trunk/milena
Index: ChangeLog
from Roland Levillain <roland(a)lrde.epita.fr>
Fix external libraries linkage in apps/statues/ on GNU/Linux.
* apps/statues/Makefile.am: Include trimesh's gluit.mk to link
with gluit/OpenGL/GLUT.
(AM_LDFLAGS): New.
Set to `$(GLFLAGS)'.
(LDADD): Append `$(GLLIBS)'.
Makefile.am | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
Index: apps/statues/Makefile.am
--- apps/statues/Makefile.am (revision 2112)
+++ apps/statues/Makefile.am (working copy)
@@ -1,11 +1,18 @@
## Process this file through Automake to produce Makefile.in -*- Makefile -*-
+# Linking with gluit and GLUT/OpenGL.
+gluit_builddir = $(top_builddir)/external/trimesh/gluit
+include $(top_srcdir)/external/trimesh/gluit/gluit.mk
+
+
# Find Milena and trimesh headers.
AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_srcdir)/external/trimesh/include
# Produce fast code.
AM_CXXFLAGS = -O3 -DNDEBUG -ggdb
-# Find the trimesh archive.
-LDADD = -L$(top_builddir)/external/trimesh/libsrc -ltrimesh
+# Find the trimesh library and its dependencies.
+AM_LDFLAGS = $(GLFLAGS)
+LDADD = -L$(top_builddir)/external/trimesh/libsrc -ltrimesh $(GLLIBS)
+
bin_PROGRAMS = mesh-segm mesh-skel
mesh_segm_SOURCES = mesh-segm.cc io.hh