[Olena-patches] last-svn-commit-982-g563d81e 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 | 10 ++++++++++ scribo/demo/viewer/Makefile.am | 4 +++- scribo/src/contest/DAE-2011/Makefile.am | 26 ++++++++++++-------------- scribo/src/contest/hdlac-2011/Makefile.am | 17 ++++++++--------- scribo/src/debug/Makefile.am | 18 ++++++++---------- 5 files changed, 41 insertions(+), 34 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 94fa9e9..df9e8db 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,13 @@ +2011-09-12 Guillaume Lazzara <z(a)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(a)lrde.epita.fr> Fix compilation dependencies of unit tests in Scribo. diff --git a/scribo/demo/viewer/Makefile.am b/scribo/demo/viewer/Makefile.am index 09d9ecc..fb68e50 100644 --- a/scribo/demo/viewer/Makefile.am +++ b/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 diff --git a/scribo/src/contest/DAE-2011/Makefile.am b/scribo/src/contest/DAE-2011/Makefile.am index 00d0009..5ee3576 100644 --- a/scribo/src/contest/DAE-2011/Makefile.am +++ b/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 diff --git a/scribo/src/contest/hdlac-2011/Makefile.am b/scribo/src/contest/hdlac-2011/Makefile.am index 7d9258a..1c1f1dd 100644 --- a/scribo/src/contest/hdlac-2011/Makefile.am +++ b/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 diff --git a/scribo/src/debug/Makefile.am b/scribo/src/debug/Makefile.am index 838974d..b1e22de 100644 --- a/scribo/src/debug/Makefile.am +++ b/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 -- 1.7.2.5