Commit 28614aa4 authored by Roland Levillain's avatar Roland Levillain Committed by Guillaume Lazzara
Browse files

Distribute Scribo.

	* configure.ac: Remove tags `<<lrde' and `dnl>>' around
	Scribo-related bits.
	* Makefile.am: Likewise.
	(LRDE_NODIST_FILES): Remove $(distdir)/scribo.
parent bcad23e4
2010-05-11 Roland Levillain <roland@lrde.epita.fr>
Distribute Scribo.
* configure.ac: Remove tags `<<lrde' and `dnl>>' around
Scribo-related bits.
* Makefile.am: Likewise.
(LRDE_NODIST_FILES): Remove $(distdir)/scribo.
2010-10-25 Guillaume Lazzara <z@lrde.epita.fr>
Handle Tesseract 2.x and 3.x in configuration.
......
# Copyright (C) 2006, 2007, 2008, 2009 EPITA Research and Development
# Copyright (C) 2006, 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
......@@ -23,11 +23,9 @@ if ENABLE_SWILENA
SUBDIRS += swilena
endif ENABLE_SWILENA
#<<lrde
if ENABLE_SCRIBO
SUBDIRS += scribo
endif ENABLE_SCRIBO
#>>
# Target shortcuts delegating the actual action to milena/Makefile.
LOCAL_RECURSIVE_TARGETS = pretty-check tests
......@@ -87,8 +85,7 @@ LRDE_NODIST_FILES = \
$(distdir)/milena/tests/linear/gaussian.cc \
$(distdir)/milena/tests/linear/gaussian/filter.cc \
$(distdir)/milena/tests/registration/registration.cc \
$(distdir)/milena/tests/value/stack.cc \
$(distdir)/scribo
$(distdir)/milena/tests/value/stack.cc
## FIXME: Running `build-aux/build_unit_test.sh' just to update
## `milena/tests/unit_test/unit-tests.mk' is overkill:
......
......@@ -165,9 +165,7 @@ AC_ARG_ENABLE([all],
[if test "x$enable_all" != xno; then
enable_trimesh=yes
enable_swilena=yes
dnl<<lrde
enable_scribo=yes
dnl>>
enable_apps=yes
enable_tools=yes
fi])
......@@ -304,7 +302,6 @@ AC_CONFIG_FILES(m4_do([swilena/python/sps-local],
[:swilena/python/sps-local.in]),
[chmod +x swilena/python/sps-local])
dnl<<lrde
## -------- ##
## Scribo. ##
## -------- ##
......@@ -363,7 +360,6 @@ if test "$GXX" = yes || test "$ICPC" = yes; then
# FIXME: We might want to use -ggdb when g++ is used.
test -z "$SCRIBO_TESTS_CXXFLAGS" && SCRIBO_TESTS_CXXFLAGS="-g -O0"
fi
dnl>>
## --------------- ##
## Configuration. ##
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment