24 Aug
2010
24 Aug
'10
2:15 p.m.
* configure.ac: Remove tags `<<lrde' and `dnl>>' around
Scribo-related bits.
* Makefile.am: Likewise.
(LRDE_NODIST_FILES): Remove $(distdir)/scribo.
---
ChangeLog | 9 +++++++++
Makefile.am | 7 ++-----
configure.ac | 4 ----
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d0cac72..55ddb57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-05-11 Roland Levillain <roland(a)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-08-24 Guillaume Lazzara <z(a)lrde.epita.fr>
* m4/oln-with-lib.m4: Force headers lookup in specified path.
diff --git a/Makefile.am b/Makefile.am
index 87987f1..f89da9f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# 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:
diff --git a/configure.ac b/configure.ac
index 5ea0ac8..09a78d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -166,9 +166,7 @@ AC_ARG_ENABLE([all],
[
enable_trimesh=yes
enable_swilena=yes
-dnl<<lrde
enable_scribo=yes
-dnl>>
enable_apps=yes
enable_tools=yes
])
@@ -447,7 +445,6 @@ AC_CONFIG_FILES(m4_do([swilena/python/sps-local],
[:swilena/python/sps-local.in]),
[chmod +x swilena/python/sps-local])
-dnl<<lrde
## -------- ##
## Scribo. ##
## -------- ##
@@ -502,7 +499,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. ##
--
1.5.6.5