[Olena-patches] last-svn-commit-501-g330d20b Setup what to install with Scribo.

26 Aug 2010

* demo/viewer/Makefile.am: Do not install includes.

	* scribo.mk (utilexecdir): New variable.

	* src/Makefile.am,
	* src/binarization/Makefile.am: Install usefull binaries in
	utilexecdir.

	* src/contest/hdibco-2010/Makefile.am,
	* src/debug/Makefile.am,
	* src/filter/Makefile.am,
	* src/misc/Makefile.am,
	* src/postprocessing/Makefile.am,
	* src/preprocessing/Makefile.am,
	* src/primitive/extract/Makefile.am,
	* src/primitive/find/Makefile.am,
	* src/primitive/group/Makefile.am,
	* src/table/Makefile.am,
	* src/text/Makefile.am: Do not install theses binaries.
---
 scribo/ChangeLog                           |   24 +++++++++
 scribo/demo/review/Makefile.am             |    1 -
 scribo/demo/viewer/Makefile.am             |   72 ++++++++++++++--------------
 scribo/scribo.mk                           |    2 +
 scribo/src/Makefile.am                     |   10 ++--
 scribo/src/binarization/Makefile.am        |   66 +++++++++++++------------
 scribo/src/contest/hdibco-2010/Makefile.am |    2 +-
 scribo/src/debug/Makefile.am               |    6 +-
 scribo/src/filter/Makefile.am              |    5 +-
 scribo/src/misc/Makefile.am                |    5 +-
 scribo/src/postprocessing/Makefile.am      |    2 +-
 scribo/src/preprocessing/Makefile.am       |   61 +++++++++++-------------
 scribo/src/primitive/extract/Makefile.am   |    5 +-
 scribo/src/primitive/find/Makefile.am      |    5 +-
 scribo/src/primitive/group/Makefile.am     |    2 +-
 scribo/src/table/Makefile.am               |    7 ++-
 scribo/src/text/Makefile.am                |    9 ++--
 17 files changed, 157 insertions(+), 127 deletions(-)

diff --git a/scribo/ChangeLog b/scribo/ChangeLog
index 9379bf0..3531f05 100644
--- a/scribo/ChangeLog
+++ b/scribo/ChangeLog
@@ -1,5 +1,29 @@
 2010-08-26  Guillaume Lazzara  <z@lrde.epita.fr>
 
+	Setup what to install with Scribo.
+
+	* demo/viewer/Makefile.am: Do not install includes.
+
+	* scribo.mk (utilexecdir): New variable.
+
+	* src/Makefile.am,
+	* src/binarization/Makefile.am: Install usefull binaries in
+	utilexecdir.
+
+	* src/contest/hdibco-2010/Makefile.am,
+	* src/debug/Makefile.am,
+	* src/filter/Makefile.am,
+	* src/misc/Makefile.am,
+	* src/postprocessing/Makefile.am,
+	* src/preprocessing/Makefile.am,
+	* src/primitive/extract/Makefile.am,
+	* src/primitive/find/Makefile.am,
+	* src/primitive/group/Makefile.am,
+	* src/table/Makefile.am,
+	* src/text/Makefile.am: Do not install theses binaries.
+
+2010-08-26  Guillaume Lazzara  <z@lrde.epita.fr>
+
 	Make use of autotroll in demo/review.
 
 	* demo/review/Makefile.am: Make use of autotroll.
diff --git a/scribo/demo/review/Makefile.am b/scribo/demo/review/Makefile.am
index cd793db..323647f 100644
--- a/scribo/demo/review/Makefile.am
+++ b/scribo/demo/review/Makefile.am
@@ -38,5 +38,4 @@ noinst_HEADERS = src/mainwindow.hh
 
 
 EXTRA_DIST = 	\
-  README	\
   review.qrc
diff --git a/scribo/demo/viewer/Makefile.am b/scribo/demo/viewer/Makefile.am
index a0112c6..eec19b9 100644
--- a/scribo/demo/viewer/Makefile.am
+++ b/scribo/demo/viewer/Makefile.am
@@ -14,27 +14,27 @@
 
 include $(top_srcdir)/build-aux/autotroll.mk
 
-bin_PROGRAMS = viewer
-viewer_SOURCES = $(BUILT_SOURCES)		\
-                 viewer.cc			\
-                 main.cc			\
-		 image_widget.cc		\
-		 xml_widget.cc			\
-		 key_widget.cc			\
-		 property_widget.cc		\
-		 browser_widget.cc		\
-		 image_scene.cc			\
-		 image_view.cc			\
-		 dommodel.cc			\
-		 domitem.cc			\
-		 image_region.cc		\
-		 help_dialog.cc			\
-		 step_widget.cc
+bin_PROGRAMS = scribo-viewer
+scribo_viewer_SOURCES = $(BUILT_SOURCES)	\
+			viewer.cc		\
+			main.cc			\
+			image_widget.cc		\
+			xml_widget.cc		\
+			key_widget.cc		\
+			property_widget.cc	\
+			browser_widget.cc	\
+			image_scene.cc		\
+			image_view.cc		\
+			dommodel.cc		\
+			domitem.cc		\
+			image_region.cc		\
+			help_dialog.cc		\
+			step_widget.cc
 
-viewer_CPPFLAGS = $(QT_CPPFLAGS) $(AM_CPPFLAGS) -I$(srcdir)
-viewer_CXXFLAGS = $(QT_CXXFLAGS) $(AM_CXXFLAGS) -O3
-viewer_LDFLAGS  = $(QT_LDFLAGS) $(LDFLAGS)
-viewer_LDADD    = $(QT_LIBS) $(LDADD)
+scribo_viewer_CPPFLAGS = $(QT_CPPFLAGS) $(AM_CPPFLAGS) -I$(srcdir)
+scribo_viewer_CXXFLAGS = $(QT_CXXFLAGS) $(AM_CXXFLAGS) -O3
+scribo_viewer_LDFLAGS  = $(QT_LDFLAGS) $(LDFLAGS)
+scribo_viewer_LDADD    = $(QT_LIBS) $(LDADD)
 
 BUILT_SOURCES = viewer.moc.cc			\
 		image_widget.moc.cc		\
@@ -50,21 +50,21 @@ BUILT_SOURCES = viewer.moc.cc			\
 		help_dialog.moc.cc		\
 		step_widget.moc.cc
 
-include_HEADERS = viewer.hh			\
-		  viewer.hxx			\
-		  image_widget.hh		\
-		  xml_widget.hh			\
-		  key_widget.hh			\
-		  property_widget.hh		\
-		  browser_widget.hh		\
-		  image_scene.hh		\
-		  image_view.hh			\
-		  dommodel.hh			\
-		  domitem.hh			\
-		  image_region.hh		\
-		  image_region.hxx		\
-		  common.hh			\
-		  help_dialog.hh		\
-		  step_widget.hh
+noinst_HEADERS = viewer.hh		\
+	 	 viewer.hxx		\
+	 	 image_widget.hh	\
+	 	 xml_widget.hh		\
+	 	 key_widget.hh		\
+	 	 property_widget.hh	\
+	 	 browser_widget.hh	\
+	 	 image_scene.hh		\
+	 	 image_view.hh		\
+	 	 dommodel.hh		\
+	 	 domitem.hh		\
+	 	 image_region.hh	\
+	 	 image_region.hxx	\
+	 	 common.hh		\
+	 	 help_dialog.hh		\
+	 	 step_widget.hh
 
 EXTRA_DIST = README
diff --git a/scribo/scribo.mk b/scribo/scribo.mk
index c899631..9c11c0f 100644
--- a/scribo/scribo.mk
+++ b/scribo/scribo.mk
@@ -25,3 +25,5 @@ AM_CPPFLAGS = 			\
 
 SCRIBO_CXXFLAGS = @SCRIBO_CXXFLAGS@
 AM_CXXFLAGS = $(SCRIBO_CXXFLAGS)
+
+utilexecdir = $(libexecdir)/scribo
\ No newline at end of file
diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am
index bb77740..4690f9f 100644
--- a/scribo/src/Makefile.am
+++ b/scribo/src/Makefile.am
@@ -30,12 +30,12 @@ SUBDIRS =					\
   text
 
 
-bin_PROGRAMS =
+utilexec_PROGRAMS =
 
 
 if HAVE_TESSERACT
 
-    bin_PROGRAMS	    += pbm_text_in_doc
+    utilexec_PROGRAMS	    += pbm_text_in_doc
     pbm_text_in_doc_SOURCES  = pbm_text_in_doc.cc
     pbm_text_in_doc_CPPFLAGS = $(AM_CPPFLAGS) \
 			       $(TESSERACT_CPPFLAGS) \
@@ -50,7 +50,7 @@ endif HAVE_TESSERACT
 
 if HAVE_MAGICKXX
 
-    bin_PROGRAMS		   += text_in_doc_preprocess
+    utilexec_PROGRAMS		   += text_in_doc_preprocess
     text_in_doc_preprocess_SOURCES  = text_in_doc_preprocess.cc
     text_in_doc_preprocess_CPPFLAGS = $(AM_CPPFLAGS) \
 				      $(MAGICKXX_CPPFLAGS)
@@ -59,7 +59,7 @@ if HAVE_MAGICKXX
 				      $(MAGICKXX_LDFLAGS)
 
 
-    bin_PROGRAMS	    += text_in_picture
+    utilexec_PROGRAMS	    += text_in_picture
     text_in_picture_SOURCES  = text_in_picture.cc
     text_in_picture_CPPFLAGS = $(AM_CPPFLAGS) \
 			       $(MAGICKXX_CPPFLAGS)
@@ -69,7 +69,7 @@ if HAVE_MAGICKXX
 
 if HAVE_TESSERACT
 
-    bin_PROGRAMS			+= text_recognition_in_picture
+    utilexec_PROGRAMS			+= text_recognition_in_picture
     text_recognition_in_picture_SOURCES  = text_recognition_in_picture.cc
     text_recognition_in_picture_CPPFLAGS = $(AM_CPPFLAGS) \
 	  			           $(TESSERACT_CPPFLAGS) \
diff --git a/scribo/src/binarization/Makefile.am b/scribo/src/binarization/Makefile.am
index 277125a..c0ef86a 100644
--- a/scribo/src/binarization/Makefile.am
+++ b/scribo/src/binarization/Makefile.am
@@ -17,12 +17,12 @@
 
 include $(top_srcdir)/scribo/scribo.mk
 
-bin_PROGRAMS = 				\
+noinst_PROGRAMS = 			\
   pgm_global_threshold_auto 		\
   pgm_sauvola 				\
   pgm_sauvola_ms			\
   ppm_sauvola 				\
-  ppm_fg_sauvola_ms 			\
+  ppm_sauvola_ms_fg 			\
   ppm_sauvola_ms 			\
   ppm_sauvola_ms_split
 
@@ -31,57 +31,61 @@ pgm_global_threshold_auto_SOURCES = pgm_global_threshold_auto.cc
 pgm_sauvola_SOURCES = pgm_sauvola.cc
 pgm_sauvola_ms_SOURCES = pgm_sauvola_ms.cc
 ppm_sauvola_SOURCES = ppm_sauvola.cc
-ppm_fg_sauvola_ms_SOURCES = ppm_fg_sauvola_ms.cc
+ppm_sauvola_ms_fg_SOURCES = ppm_sauvola_ms_fg.cc
 ppm_sauvola_ms_SOURCES = ppm_sauvola_ms.cc
 ppm_sauvola_ms_split_SOURCES = ppm_sauvola_ms_split.cc
 
 
 if HAVE_MAGICKXX
-  bin_PROGRAMS +=                       \
-   fg_sauvola_ms 			\
+
+  noinst_PROGRAMS +=  			\
+   sauvola_debug 			\
+   sauvola_ms_debug
+
+  utilexec_PROGRAMS =                   \
    sauvola 				\
-   sauvola_debug			\
    sauvola_ms                           \
-   sauvola_ms_debug                     \
+   sauvola_ms_fg 			\
    sauvola_ms_split
 
-  fg_sauvola_ms_SOURCES = fg_sauvola_ms.cc
-  fg_sauvola_ms_CPPFLAGS = $(AM_CPPFLAGS) \
+  sauvola_ms_fg_SOURCES  = sauvola_ms_fg.cc
+  sauvola_ms_fg_CPPFLAGS = $(AM_CPPFLAGS) 	\
 			   $(MAGICKXX_CPPFLAGS)
-  fg_sauvola_ms_LDFLAGS = $(AM_LDFLAGS) \
-			  $(MAGICKXX_LDFLAGS)
+  sauvola_ms_fg_LDFLAGS  = $(AM_LDFLAGS) 	\
+			   $(MAGICKXX_LDFLAGS)
 
-  sauvola_SOURCES = sauvola.cc
-  sauvola_CPPFLAGS = $(AM_CPPFLAGS) \
+  sauvola_SOURCES  = sauvola.cc
+  sauvola_CPPFLAGS = $(AM_CPPFLAGS) 		\
 		     $(MAGICKXX_CPPFLAGS)
-  sauvola_LDFLAGS = $(AM_LDFLAGS) \
-		    $(MAGICKXX_LDFLAGS)
+  sauvola_LDFLAGS  = $(AM_LDFLAGS) 		\
+		     $(MAGICKXX_LDFLAGS)
 
-  sauvola_debug_SOURCES = sauvola_debug.cc
-  sauvola_debug_CPPFLAGS = $(AM_CPPFLAGS) \
+  sauvola_debug_SOURCES  = sauvola_debug.cc
+  sauvola_debug_CPPFLAGS = $(AM_CPPFLAGS) 	\
 			   $(MAGICKXX_CPPFLAGS)
-  sauvola_debug_LDFLAGS = $(AM_LDFLAGS) \
-			  $(MAGICKXX_LDFLAGS)
+  sauvola_debug_LDFLAGS  = $(AM_LDFLAGS) 	\
+			   $(MAGICKXX_LDFLAGS)
 
 
-  sauvola_ms_SOURCES = sauvola_ms.cc
-  sauvola_ms_CPPFLAGS = $(AM_CPPFLAGS) \
+  sauvola_ms_SOURCES  = sauvola_ms.cc
+  sauvola_ms_CPPFLAGS = $(AM_CPPFLAGS) 		\
 			$(MAGICKXX_CPPFLAGS)
-  sauvola_ms_LDFLAGS = $(AM_LDFLAGS) \
-		       $(MAGICKXX_LDFLAGS)
+  sauvola_ms_LDFLAGS  = $(AM_LDFLAGS) 		\
+		        $(MAGICKXX_LDFLAGS)
 
-  sauvola_ms_debug_SOURCES = sauvola_ms_debug.cc
-  sauvola_ms_debug_CPPFLAGS = $(AM_CPPFLAGS) -DSCRIBO_SAUVOLA_DEBUG \
+  sauvola_ms_debug_SOURCES  = sauvola_ms_debug.cc
+  sauvola_ms_debug_CPPFLAGS = $(AM_CPPFLAGS) 		\
+			      -DSCRIBO_SAUVOLA_DEBUG 	\
 			      $(MAGICKXX_CPPFLAGS)
-  sauvola_ms_debug_LDFLAGS = $(AM_LDFLAGS) \
-		             $(MAGICKXX_LDFLAGS)
+  sauvola_ms_debug_LDFLAGS  = $(AM_LDFLAGS) 		\
+		              $(MAGICKXX_LDFLAGS)
 
 
-  sauvola_ms_split_SOURCES = sauvola_ms_split.cc
-  sauvola_ms_split_CPPFLAGS = $(AM_CPPFLAGS) \
+  sauvola_ms_split_SOURCES  = sauvola_ms_split.cc
+  sauvola_ms_split_CPPFLAGS = $(AM_CPPFLAGS) 		\
 			      $(MAGICKXX_CPPFLAGS)
-  sauvola_ms_split_LDFLAGS = $(AM_LDFLAGS) \
-			     $(MAGICKXX_LDFLAGS)
+  sauvola_ms_split_LDFLAGS  = $(AM_LDFLAGS) 		\
+			      $(MAGICKXX_LDFLAGS)
 
 
 endif HAVE_MAGICKXX
diff --git a/scribo/src/contest/hdibco-2010/Makefile.am b/scribo/src/contest/hdibco-2010/Makefile.am
index a59e424..5730b26 100644
--- a/scribo/src/contest/hdibco-2010/Makefile.am
+++ b/scribo/src/contest/hdibco-2010/Makefile.am
@@ -19,7 +19,7 @@
 
 include $(top_srcdir)/scribo/tests/tests.mk
 
-bin_PROGRAMS = sauvola_ms_hdibco
+noinst_PROGRAMS = sauvola_ms_hdibco
 
 sauvola_ms_hdibco_SOURCES = sauvola_ms_hdibco.cc
 
diff --git a/scribo/src/debug/Makefile.am b/scribo/src/debug/Makefile.am
index f3dd4f9..d203f5c 100644
--- a/scribo/src/debug/Makefile.am
+++ b/scribo/src/debug/Makefile.am
@@ -17,7 +17,7 @@
 
 include $(top_srcdir)/scribo/scribo.mk
 
-bin_PROGRAMS = 					\
+noinst_PROGRAMS = 				\
   show_info_x_height 				\
   show_info_median_inter_characters		\
   show_links_left_right_links_validation 	\
@@ -75,8 +75,8 @@ show_objects_thin_SOURCES = show_objects_thin.cc
 
 if HAVE_MAGICKXX
 
-  bin_PROGRAMS += highlight_text_area
-  highlight_text_area_SOURCES = highlight_text_area.cc
+  noinst_PROGRAMS 	      += highlight_text_area
+  highlight_text_area_SOURCES  = highlight_text_area.cc
   highlight_text_area_CPPFLAGS = $(AM_CPPFLAGS) \
 				`Magick++-config --cppflags`
   highlight_text_area_LDFLAGS  = $(AM_LDFLAGS) \
diff --git a/scribo/src/filter/Makefile.am b/scribo/src/filter/Makefile.am
index 4e2b8d1..5d5b721 100644
--- a/scribo/src/filter/Makefile.am
+++ b/scribo/src/filter/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory
+# (LRDE).
 #
 # This file is part of Olena.
 #
@@ -16,7 +17,7 @@
 
 include $(top_srcdir)/scribo/scribo.mk
 
-bin_PROGRAMS = 				\
+noinst_PROGRAMS = 			\
   objects_large 			\
   objects_small 			\
   objects_thick 			\
diff --git a/scribo/src/misc/Makefile.am b/scribo/src/misc/Makefile.am
index 693b579..0323aaa 100644
--- a/scribo/src/misc/Makefile.am
+++ b/scribo/src/misc/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory
+# (LRDE).
 #
 # This file is part of Olena.
 #
@@ -16,7 +17,7 @@
 
 include $(top_srcdir)/scribo/scribo.mk
 
-bin_PROGRAMS = 				\
+noinst_PROGRAMS = 			\
   dmap                               	\
   morpho                    		\
   negate 				\
diff --git a/scribo/src/postprocessing/Makefile.am b/scribo/src/postprocessing/Makefile.am
index b21cac2..f0c588d 100644
--- a/scribo/src/postprocessing/Makefile.am
+++ b/scribo/src/postprocessing/Makefile.am
@@ -19,7 +19,7 @@
 
 include $(top_srcdir)/scribo/scribo.mk
 
-bin_PROGRAMS = 				\
+noinst_PROGRAMS = 		\
   fill_object_holes
 
 
diff --git a/scribo/src/preprocessing/Makefile.am b/scribo/src/preprocessing/Makefile.am
index 0c6e00a..ef62ed6 100644
--- a/scribo/src/preprocessing/Makefile.am
+++ b/scribo/src/preprocessing/Makefile.am
@@ -17,7 +17,7 @@
 
 include $(top_srcdir)/scribo/scribo.mk
 
-bin_PROGRAMS = 				\
+noinst_PROGRAMS = 			\
   denoise_bg 				\
   denoise_fg 				\
   homogeneous_contrast 			\
@@ -32,49 +32,44 @@ unskew_SOURCES = unskew.cc
 
 if HAVE_MAGICKXX
 
-    bin_PROGRAMS += split_bg_fg
-    split_bg_fg_SOURCES = split_bg_fg.cc
+    noinst_PROGRAMS    	+= split_bg_fg
+    split_bg_fg_SOURCES  = split_bg_fg.cc
     split_bg_fg_CPPFLAGS = $(AM_CPPFLAGS) \
 		           $(MAGICKXX_CPPFLAGS)
+    split_bg_fg_LDFLAGS  = $(AM_LDFLAGS) \
+			   $(MAGICKXX_LDFLAGS) \
+			   -lpthread
 
-    split_bg_fg_LDFLAGS = $(AM_LDFLAGS) \
-			  $(MAGICKXX_LDFLAGS) \
-			  -lpthread
-
-    bin_PROGRAMS += rotate
-    rotate_SOURCES = rotate.cc
+    noinst_PROGRAMS += rotate
+    rotate_SOURCES  = rotate.cc
     rotate_CPPFLAGS = $(AM_CPPFLAGS) \
 	              $(MAGICKXX_CPPFLAGS)
+    rotate_LDFLAGS  = $(AM_LDFLAGS) \
+		      $(MAGICKXX_LDFLAGS) \
+		      -lpthread
 
-    rotate_LDFLAGS = $(AM_LDFLAGS) \
-		     $(MAGICKXX_LDFLAGS) \
-		     -lpthread
-
-    bin_PROGRAMS += rotate_90
-    rotate_90_SOURCES = rotate_90.cc
+    noinst_PROGRAMS   += rotate_90
+    rotate_90_SOURCES  = rotate_90.cc
     rotate_90_CPPFLAGS = $(AM_CPPFLAGS) \
 	                 $(MAGICKXX_CPPFLAGS)
+    rotate_90_LDFLAGS  = $(AM_LDFLAGS) \
+		         $(MAGICKXX_LDFLAGS) \
+			 -lpthread
 
-    rotate_90_LDFLAGS = $(AM_LDFLAGS) \
-		        $(MAGICKXX_LDFLAGS) \
-			-lpthread
-
-    bin_PROGRAMS += to_pgm
-    to_pgm_SOURCES = to_pgm.cc
-    to_pgm_CPPFLAGS = $(AM_CPPFLAGS) \
-		      $(MAGICKXX_CPPFLAGS)
+    noinst_PROGRAMS += to_pgm
+    to_pgm_SOURCES   = to_pgm.cc
+    to_pgm_CPPFLAGS  = $(AM_CPPFLAGS) \
+		       $(MAGICKXX_CPPFLAGS)
+    to_pgm_LDFLAGS   = $(AM_LDFLAGS) \
+		       $(MAGICKXX_LDFLAGS) \
+		       -lpthread
 
-    to_pgm_LDFLAGS = $(AM_LDFLAGS) \
-		     $(MAGICKXX_LDFLAGS) \
-		     -lpthread
-
-    bin_PROGRAMS += subsample
-    subsample_SOURCES = subsample.cc
+    noinst_PROGRAMS   += subsample
+    subsample_SOURCES  = subsample.cc
     subsample_CPPFLAGS = $(AM_CPPFLAGS) \
 			 $(MAGICKXX_CPPFLAGS)
-
-    subsample_LDFLAGS = $(AM_LDFLAGS) \
-		        $(MAGICKXX_LDFLAGS) \
-		        -lpthread
+    subsample_LDFLAGS  = $(AM_LDFLAGS) \
+		         $(MAGICKXX_LDFLAGS) \
+		         -lpthread
 
 endif HAVE_MAGICKXX
diff --git a/scribo/src/primitive/extract/Makefile.am b/scribo/src/primitive/extract/Makefile.am
index 6f20ea3..2c8188e 100644
--- a/scribo/src/primitive/extract/Makefile.am
+++ b/scribo/src/primitive/extract/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory
+# (LRDE).
 #
 # This file is part of Olena.
 #
@@ -17,7 +18,7 @@
 include $(top_srcdir)/scribo/scribo.mk
 
 
-bin_PROGRAMS = 			\
+noinst_PROGRAMS = 		\
   extract_discontinued_lines  	\
   extract_discontinued_vlines   \
   extract_discontinued_hlines  	\
diff --git a/scribo/src/primitive/find/Makefile.am b/scribo/src/primitive/find/Makefile.am
index 3b5dbd2..b001f87 100644
--- a/scribo/src/primitive/find/Makefile.am
+++ b/scribo/src/primitive/find/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory
+# (LRDE).
 #
 # This file is part of Olena.
 #
@@ -17,7 +18,7 @@
 include $(top_srcdir)/scribo/scribo.mk
 
 
-bin_PROGRAMS = 			\
+noinst_PROGRAMS = 		\
   find_discontinued_lines 	\
   find_pattern_lines 		\
   find_single_lines 		\
diff --git a/scribo/src/primitive/group/Makefile.am b/scribo/src/primitive/group/Makefile.am
index afc4f8e..37c32c7 100644
--- a/scribo/src/primitive/group/Makefile.am
+++ b/scribo/src/primitive/group/Makefile.am
@@ -17,7 +17,7 @@
 
 include $(top_srcdir)/scribo/scribo.mk
 
-bin_PROGRAMS = 					\
+noinst_PROGRAMS = 				\
   group_from_double_link           		\
   group_from_double_several_links  		\
   group_from_several_left_links    		\
diff --git a/scribo/src/table/Makefile.am b/scribo/src/table/Makefile.am
index 50ea8fd..664aeb4 100644
--- a/scribo/src/table/Makefile.am
+++ b/scribo/src/table/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory
+# (LRDE).
 #
 # This file is part of Olena.
 #
@@ -16,12 +17,12 @@
 
 include $(top_srcdir)/scribo/scribo.mk
 
-bin_PROGRAMS =
+noinst_PROGRAMS =
 
 # Disabled:
 #----------
 #
-#bin_PROGRAMS =				\
+#noinst_PROGRAMS =			\
 #  erase 				\
 #  extract 				\
 #  rebuild_opening 			\
diff --git a/scribo/src/text/Makefile.am b/scribo/src/text/Makefile.am
index fc03ae8..db97cb8 100644
--- a/scribo/src/text/Makefile.am
+++ b/scribo/src/text/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory
+# (LRDE).
 #
 # This file is part of Olena.
 #
@@ -16,7 +17,7 @@
 
 include $(top_srcdir)/scribo/scribo.mk
 
-bin_PROGRAMS = 					\
+noinst_PROGRAMS = 	\
   cleantxt
 
 
@@ -26,7 +27,7 @@ cleantxt_SOURCES = cleantxt.cc
 if HAVE_TESSERACT
 if HAVE_TIFF
 
-    bin_PROGRAMS 	 	  += pbm_lines_recognition
+    noinst_PROGRAMS 	  	  += pbm_lines_recognition
     pbm_lines_recognition_SOURCES  = pbm_lines_recognition.cc
     pbm_lines_recognition_CPPFLAGS = $(AM_CPPFLAGS) \
 		  		     $(TESSERACT_CPPFLAGS) \
@@ -36,7 +37,7 @@ if HAVE_TIFF
 				     $(TIFF_LDFLAGS) \
 				     -lpthread
 
-    bin_PROGRAMS 	     += pbm_recognition
+    noinst_PROGRAMS	     += pbm_recognition
     pbm_recognition_SOURCES   = pbm_recognition.cc
     pbm_recognition_CPPFLAGS  = $(AM_CPPFLAGS) \
 			        $(TESSERACT_CPPFLAGS) \
-- 
1.5.6.5

    