* apps/statues/Makefile.am (AM_CPPFLAGS): Move Trimesh-related part... (CPPFLAGS_trimesh): ...here (new variable). (AM_LDFLAGS, LDADD): Rename variables as... (LDFLAGS_trimesh, LDADD_trimesh): ...these. (mesh_segm_CPPFLAGS, mesh_segm_LDFLAGS, mesh_segm_LDADD) (mesh_skel_CPPFLAGS, mesh_skel_LDFLAGS, mesh_skel_LDADD) (mesh_pinv_curv_CPPFLAGS, mesh_pinv_curv_LDFLAGS, mesh_pinv_curv_LDADD) (mesh_max_curv_CPPFLAGS, mesh_max_curv_LDFLAGS, mesh_max_curv_LDADD): New variables. --- milena/ChangeLog | 15 ++++++++++++ milena/apps/statues/Makefile.am | 46 +++++++++++++++++++++++++++++++++------ 2 files changed, 54 insertions(+), 7 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 3f777de..e02b029 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,20 @@ 2008-11-18 Roland Levillain <roland(a)lrde.epita.fr> + Reorganize apps/statues/Makefile.am. + + * apps/statues/Makefile.am (AM_CPPFLAGS): + Move Trimesh-related part... + (CPPFLAGS_trimesh): ...here (new variable). + (AM_LDFLAGS, LDADD): Rename variables as... + (LDFLAGS_trimesh, LDADD_trimesh): ...these. + (mesh_segm_CPPFLAGS, mesh_segm_LDFLAGS, mesh_segm_LDADD) + (mesh_skel_CPPFLAGS, mesh_skel_LDFLAGS, mesh_skel_LDADD) + (mesh_pinv_curv_CPPFLAGS, mesh_pinv_curv_LDFLAGS, mesh_pinv_curv_LDADD) + (mesh_max_curv_CPPFLAGS, mesh_max_curv_LDFLAGS, mesh_max_curv_LDADD): + New variables. + +2008-11-18 Roland Levillain <roland(a)lrde.epita.fr> + Add computed meshes (with curvature). * mesh/bunny-holefilled-max-curv.off, diff --git a/milena/apps/statues/Makefile.am b/milena/apps/statues/Makefile.am index d41ead6..971a4ec 100644 --- a/milena/apps/statues/Makefile.am +++ b/milena/apps/statues/Makefile.am @@ -4,21 +4,53 @@ 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 +AM_CPPFLAGS = -I$(top_srcdir)/milena +CPPFLAGS_trimesh = -I$(top_srcdir)/external/trimesh/include # Produce fast code. AM_CXXFLAGS = -O3 -DNDEBUG -ggdb # Find the trimesh library and its dependencies. -AM_LDFLAGS = $(GLFLAGS) -LDADD = -L$(top_builddir)/external/trimesh/libsrc -ltrimesh $(GLLIBS) +# +# Don't use TRIMESH_LDFLAGS, since it looks like the LDFLAGS of the +# program `TRIMESH' and triggers Automake warnings; use +# LDFLAGS_trimesh instead. Likewise for CPPFLAGS_trimesh and +# LDADD_trimesh, for symmetry reasons. +LDFLAGS_trimesh = $(GLFLAGS) +LDADD_trimesh = -L$(top_builddir)/external/trimesh/libsrc -ltrimesh $(GLLIBS) +# FIXME: Have program names embed the type of structure used (either +# graph or complex). -bin_PROGRAMS = mesh-pinv-curv mesh-max-curv mesh-segm mesh-skel +## ------------------------------------------------ ## +## Graph-based applications, depending on Trimesh. ## +## ------------------------------------------------ ## + +bin_PROGRAMS = mesh-segm mesh-skel -mesh_pinv_curv_SOURCES = mesh-pinv-curv.cc io.hh -mesh_max_curv_SOURCES = mesh-max-curv.cc io.hh mesh_segm_SOURCES = mesh-segm.cc io.hh +mesh_segm_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_trimesh) +mesh_segm_LDFLAGS = $(LDFLAGS_trimesh) +mesh_segm_LDADD = $(LDADD_trimesh) + mesh_skel_SOURCES = mesh-skel.cc io.hh +mesh_skel_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_trimesh) +mesh_skel_LDFLAGS = $(LDFLAGS_trimesh) +mesh_skel_LDADD = $(LDADD_trimesh) + +## -------------------------------------------------- ## +## Complex-based applications, depending on Trimesh. ## +## -------------------------------------------------- ## + +bin_PROGRAMS += mesh-pinv-curv mesh-max-curv + +mesh_pinv_curv_SOURCES = mesh-pinv-curv.cc io.hh +mesh_pinv_curv_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_trimesh) +mesh_pinv_curv_LDFLAGS = $(LDFLAGS_trimesh) +mesh_pinv_curv_LDADD = $(LDADD_trimesh) + +mesh_max_curv_SOURCES = mesh-max-curv.cc io.hh +mesh_max_curv_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_trimesh) +mesh_max_curv_LDFLAGS = $(LDFLAGS_trimesh) +mesh_max_curv_LDADD = $(LDADD_trimesh) TESTS = test -- 1.6.0.1