More fixes in Scribo build system.

	* demo/viewer/Makefile.am: Add missing distributed files.

	* src/contest/DAE-2011/Makefile.am,
	* src/contest/hdlac-2011/Makefile.am,
	* src/debug/Makefile.am: Fix dependencies.

scribo/ChangeLog

+2011-09-12  Guillaume Lazzara  <z@lrde.epita.fr>
+
+	More fixes in Scribo build system.
+
+	* demo/viewer/Makefile.am: Add missing distributed files.
+
+	* src/contest/DAE-2011/Makefile.am,
+	* src/contest/hdlac-2011/Makefile.am,
+	* src/debug/Makefile.am: Fix dependencies.
+
 2011-09-10  Roland Levillain  <roland@lrde.epita.fr>
 
 	Fix compilation dependencies of unit tests in Scribo.

scribo/demo/viewer/Makefile.am

@@ -133,5 +133,7 @@ EXTRA_DIST =			\
 	segmentation_options.ui	\
 	ocr_options.ui		\
 	help_dialog.ui 		\
-	demodir.hh.in
+	demodir.hh.in		\
+	viewer.qrc		\
+	icons/olena_smaller.jpg
 

scribo/src/contest/DAE-2011/Makefile.am

@@ -27,22 +27,20 @@ if HAVE_MAGICKXX
 noinst_PROGRAMS += content_in_hdoc_dae content_in_doc_dae
 
 content_in_hdoc_dae_SOURCES = content_in_hdoc_dae.cc
-content_in_hdoc_dae_CPPFLAGS = $(AM_CPPFLAGS) \
-				 $(MAGICKXX_CPPFLAGS) \
-				 $(TESSERACT_CPPFLAGS) \
-				 -I$(top_builddir)
-content_in_hdoc_dae_LDFLAGS  = $(AM_LDFLAGS) \
-				 -lpthread \
-				 $(MAGICKXX_LDFLAGS)
+content_in_hdoc_dae_CPPFLAGS = $(AM_CPPFLAGS) 		\
+			       $(MAGICKXX_CPPFLAGS) 	\
+			       -I$(top_builddir)
+content_in_hdoc_dae_LDFLAGS  = $(AM_LDFLAGS) 		\
+			       -lpthread 		\
+			       $(MAGICKXX_LDFLAGS)
 
 content_in_doc_dae_SOURCES = content_in_doc_dae.cc
-content_in_doc_dae_CPPFLAGS = $(AM_CPPFLAGS) \
-				 $(MAGICKXX_CPPFLAGS) \
-				 $(TESSERACT_CPPFLAGS) \
-				 -I$(top_builddir)
-content_in_doc_dae_LDFLAGS  = $(AM_LDFLAGS) \
-				 -lpthread \
-				 $(MAGICKXX_LDFLAGS)
+content_in_doc_dae_CPPFLAGS = $(AM_CPPFLAGS) 		\
+			      $(MAGICKXX_CPPFLAGS) 	\
+			      -I$(top_builddir)
+content_in_doc_dae_LDFLAGS  = $(AM_LDFLAGS) 		\
+			      -lpthread 		\
+			      $(MAGICKXX_LDFLAGS)
 
 
 endif HAVE_MAGICKXX

scribo/src/contest/hdlac-2011/Makefile.am

@@ -27,12 +27,11 @@ if HAVE_MAGICKXX
 noinst_PROGRAMS += content_in_hdoc_hdlac
 
 content_in_hdoc_hdlac_SOURCES = content_in_hdoc_hdlac.cc
-content_in_hdoc_hdlac_CPPFLAGS = $(AM_CPPFLAGS) \
-				 $(MAGICKXX_CPPFLAGS) \
-				 $(TESSERACT_CPPFLAGS) \
-				 -I$(top_builddir)
-content_in_hdoc_hdlac_LDFLAGS  = $(AM_LDFLAGS) \
-				 -lpthread \
-				 $(MAGICKXX_LDFLAGS)
-
-endif HAVE_MAGICKXX
+content_in_hdoc_hdlac_CPPFLAGS = $(AM_CPPFLAGS) 	\
+				 $(MAGICKXX_CPPFLAGS) 	\
+	  		    	 -I$(top_builddir)
+content_in_hdoc_hdlac_LDFLAGS  = $(AM_LDFLAGS) 		\
+		      	       	 -lpthread 		\
+			   	 $(MAGICKXX_LDFLAGS)
+
+endif HAVE_MAGICKXX
\ No newline at end of file

scribo/src/debug/Makefile.am

@@ -86,6 +86,14 @@ show_objects_thin_SOURCES = show_objects_thin.cc
 
 if HAVE_MAGICKXX
 
+  noinst_PROGRAMS += show_lines_boldness
+  show_lines_boldness_SOURCES  = show_lines_boldness.cc
+  show_lines_boldness_CPPFLAGS = $(AM_CPPFLAGS) \
+				 $(MAGICKXX_CPPFLAGS)
+  show_lines_boldness_LDFLAGS  = $(AM_LDFLAGS) \
+				 $(MAGICKXX_LDFLAGS)
+
+
   noinst_PROGRAMS +=  show_components_color
   show_components_color_SOURCES  = show_components_color.cc
   show_components_color_CPPFLAGS = $(AM_CPPFLAGS) \
@@ -100,16 +108,6 @@ if HAVE_MAGICKXX
   show_components_boldness_LDFLAGS  = $(AM_LDFLAGS) \
 				      $(MAGICKXX_LDFLAGS)
 
-if HAVE_TESSERACT
-  noinst_PROGRAMS += show_lines_boldness
-  show_lines_boldness_SOURCES = show_lines_boldness.cc
-  show_lines_boldness_CPPFLAGS = $(AM_CPPFLAGS) \
-				 $(MAGICKXX_CPPFLAGS) \
-				 $(TESSERACT_CPPFLAGS)
-  show_lines_boldness_LDFLAGS  = $(AM_LDFLAGS) \
-				 $(MAGICKXX_LDFLAGS)
-endif HAVE_TESSERACT
-
 if HAVE_QT
 
   noinst_PROGRAMS +=  show_paragraph_blocks