* demo/viewer/Makefile.am: Take into account no-strict-aliasing
flag.
* demo/review/Makefile.am,
* src/toolchain/nepomuk/Makefile.am: Do not distribute some
examples.
---
milena/ChangeLog | 11 +++++++++++
scribo/demo/review/Makefile.am | 2 +-
scribo/demo/viewer/Makefile.am | 3 ++-
scribo/src/toolchain/nepomuk/Makefile.am | 7 ++++---
4 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/milena/ChangeLog b/milena/ChangeLog
index e447f1b..5712ee9 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,5 +1,16 @@
2011-09-15 Guillaume Lazzara <z(a)lrde.epita.fr>
+ Fix Scribo build system.
+
+ * demo/viewer/Makefile.am: Take into account no-strict-aliasing
+ flag.
+
+ * demo/review/Makefile.am,
+ * src/toolchain/nepomuk/Makefile.am: Do not distribute some
+ examples.
+
+2011-09-15 Guillaume Lazzara <z(a)lrde.epita.fr>
+
Improve text justification in HTML document reconstruction.
* demo/xml2doc/templates/html/css.css,
diff --git a/scribo/demo/review/Makefile.am b/scribo/demo/review/Makefile.am
index d451f88..ec4a971 100644
--- a/scribo/demo/review/Makefile.am
+++ b/scribo/demo/review/Makefile.am
@@ -17,7 +17,7 @@
include $(top_srcdir)/build-aux/autotroll.mk
-bin_PROGRAMS = scribo-review
+noinst_PROGRAMS = scribo-review
BUILT_SOURCES = src/mainwindow.moc.cc \
mainwindow.ui.h
diff --git a/scribo/demo/viewer/Makefile.am b/scribo/demo/viewer/Makefile.am
index fb68e50..0b4e17f 100644
--- a/scribo/demo/viewer/Makefile.am
+++ b/scribo/demo/viewer/Makefile.am
@@ -50,7 +50,8 @@ scribo_viewer_CPPFLAGS = $(QT_CPPFLAGS) $(AM_CPPFLAGS) -I$(srcdir) \
$(TESSERACT_CPPFLAGS) \
$(TIFF_CPPFLAGS) \
-DNDEBUG -DMLN_WO_GLOBAL_VARS
-scribo_viewer_CXXFLAGS = $(QT_CXXFLAGS) $(AM_CXXFLAGS) -O3
+scribo_viewer_CXXFLAGS = $(QT_CXXFLAGS) $(AM_CXXFLAGS) \
+ $(STRICT_ALIASING_CXXFLAGS) -O3
scribo_viewer_LDFLAGS = $(QT_LDFLAGS) $(LDFLAGS) \
$(MAGICKXX_LDFLAGS) \
$(TESSERACT_LDFLAGS) \
diff --git a/scribo/src/toolchain/nepomuk/Makefile.am
b/scribo/src/toolchain/nepomuk/Makefile.am
index 4328be5..62a7fdb 100644
--- a/scribo/src/toolchain/nepomuk/Makefile.am
+++ b/scribo/src/toolchain/nepomuk/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2010, 2011 EPITA Research and Development Laboratory
+# (LRDE).
#
# This file is part of Olena.
#
@@ -16,13 +17,13 @@
include $(top_srcdir)/scribo/scribo.mk
-bin_PROGRAMS =
+noinst_PROGRAMS =
if HAVE_QT
if HAVE_MAGICKXX
if HAVE_TESSERACT
-bin_PROGRAMS += \
+noinst_PROGRAMS += \
text_extraction
text_extraction_SOURCES = text_extraction.cc
--
1.7.2.5
Show replies by date