* tools/Makefile.am: Fix build rules of optional programs. * tools/simple_point3d_lut_tbb.cc: Rename as... * tools/simple_point_3d_lut_tbb.cc: ...this. s/point_3d/point3d/. --- milena/ChangeLog | 9 ++++++++ milena/tools/Makefile.am | 24 ++++++++++++++------ ...int_3d_lut_tbb.cc => simple_point3d_lut_tbb.cc} | 12 +++++----- 3 files changed, 32 insertions(+), 13 deletions(-) rename milena/tools/{simple_point_3d_lut_tbb.cc => simple_point3d_lut_tbb.cc} (78%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 48d5c46..7cfb2ac 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2013-08-29 Roland Levillain <roland@lrde.epita.fr> + Fix 3D simple point generators in Milena tools. + + * tools/Makefile.am: Fix build rules of optional programs. + * tools/simple_point3d_lut_tbb.cc: Rename as... + * tools/simple_point_3d_lut_tbb.cc: ...this. + s/point_3d/point3d/. + +2013-08-29 Roland Levillain <roland@lrde.epita.fr> + Kill warnings about unused variables. * mln/io/vtk/save.hh, diff --git a/milena/tools/Makefile.am b/milena/tools/Makefile.am index 504d1b0..dce1cad 100644 --- a/milena/tools/Makefile.am +++ b/milena/tools/Makefile.am @@ -58,10 +58,8 @@ simple_point3d_lut_tbb_LDFLAGS = $(LDFLAGS_TBB) simple_point_luts: simple_point3d_lut_26_6.hh CLEANFILES = simple_point3d_lut_26_6.txt -# Careful, there is no dependency on the generator (on purpose, -# because regenerating these files takes time). -simple_point3d_lut_26_6.txt: - ./simple_point3d_lut_tbb$(EXEEXT) 26_6 >$@ +simple_point3d_lut_26_6.txt: simple_point3d_lut_tbb$(EXEEXT) + ./$< 26_6 >$@ EXTRA_DIST = gen_cxx_lut CLEANFILES += simple_point3d_lut_26_6.hh @@ -73,9 +71,21 @@ simple_point3d_lut_26_6.hh: simple_point3d_lut_26_6.txt $(srcdir)/gen_cxx_lut # Very long (both to compile and execute) optional test, checking the # consistency of the LUT in simple_point3d_lut_26_6.hh. Moreover, it # should be turned into a parallel program. -noinst_LTLIBRARIES = libsimple_point3d_lut_26_6.la -libsimple_point3d_lut_26_6_la_SOURCES = \ - simple_point3d_lut_26_6.hh simple_point3d_lut_26_6.cc + +.PHONY: check-extra +check-extra: test_simple_point3d_lut_26_6$(EXEEXT) + ./$< + +EXTRA_LTLIBRARIES = libsimple_point3d_lut_26_6.la +libsimple_point3d_lut_26_6_la_SOURCES = simple_point3d_lut_26_6.cc +nodist_libsimple_point3d_lut_26_6_la_SOURCES = simple_point3d_lut_26_6.hh +# Generate this build dependency of libsimple_point3d_lut_26_6.la. +simple_point3d_lut_26_6.lo: simple_point3d_lut_26_6.hh + EXTRA_PROGRAMS += test_simple_point3d_lut_26_6 test_simple_point3d_lut_26_6_SOURCES = test_simple_point3d_lut_26_6.cc test_simple_point3d_lut_26_6_LDADD = libsimple_point3d_lut_26_6.la +# Generate this build dependency of test_simple_point3d_lut_26_6. +test_simple_point3d_lut_26_6.o: simple_point3d_lut_26_6.hh + +CLEANFILES += $(EXTRA_PROGRAMS) $(EXTRA_LTLIBRARIES) diff --git a/milena/tools/simple_point_3d_lut_tbb.cc b/milena/tools/simple_point3d_lut_tbb.cc similarity index 78% rename from milena/tools/simple_point_3d_lut_tbb.cc rename to milena/tools/simple_point3d_lut_tbb.cc index 57a44dd..7ba9654 100644 --- a/milena/tools/simple_point_3d_lut_tbb.cc +++ b/milena/tools/simple_point3d_lut_tbb.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011, 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -27,7 +27,7 @@ /// 3D point is simple or not, in parallel, using Intel Threading /// Building Blocks. -#include "simple_point_3d_lut_tbb.hh" +#include "simple_point3d_lut_tbb.hh" int main(int argc, char* argv[]) @@ -37,10 +37,10 @@ main(int argc, char* argv[]) std::string nbhs = argv[1]; simple_point_lut_t simple_point_lut; - if (nbhs == "6_26") simple_point_lut = simple_point_3d_lut_tbb__6_26(); - else if (nbhs == "26_6") simple_point_lut = simple_point_3d_lut_tbb__26_6(); - else if (nbhs == "6p_18") simple_point_lut = simple_point_3d_lut_tbb__6p_18(); - else if (nbhs == "18_6p") simple_point_lut = simple_point_3d_lut_tbb__18_6p(); + if (nbhs == "6_26") simple_point_lut = simple_point3d_lut_tbb__6_26(); + else if (nbhs == "26_6") simple_point_lut = simple_point3d_lut_tbb__26_6(); + else if (nbhs == "6p_18") simple_point_lut = simple_point3d_lut_tbb__6p_18(); + else if (nbhs == "18_6p") simple_point_lut = simple_point3d_lut_tbb__18_6p(); else usage(argv[0]); -- 1.7.10.4