* src/Makefile.am, * tests/Makefile.am (SUBDIRS): Add table. * src/table/Makefile.am, * tests/table/Makefile.am: Disable tests. --- scribo/ChangeLog | 10 ++++++++++ scribo/src/Makefile.am | 3 +-- scribo/src/table/Makefile.am | 24 ++++++++++++++---------- scribo/tests/Makefile.am | 7 ++----- scribo/tests/table/Makefile.am | 12 +++++++----- 5 files changed, 34 insertions(+), 22 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index ee5d3d9..e1cefe4 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,13 @@ +2010-08-25 Guillaume Lazzara <z@lrde.epita.fr> + + Re-enable 'table' directory in SUBDIRS. + + * src/Makefile.am, + * tests/Makefile.am (SUBDIRS): Add table. + + * src/table/Makefile.am, + * tests/table/Makefile.am: Disable tests. + 2010-10-28 Guillaume Lazzara <z@lrde.epita.fr> Small fixes in Scribo diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am index c99a791..4222554 100644 --- a/scribo/src/Makefile.am +++ b/scribo/src/Makefile.am @@ -26,11 +26,10 @@ SUBDIRS = \ misc \ postprocessing \ preprocessing \ + table \ text \ toolchain -# Disabled for the moment: -# table bin_PROGRAMS = diff --git a/scribo/src/table/Makefile.am b/scribo/src/table/Makefile.am index 7fc7008..50ea8fd 100644 --- a/scribo/src/table/Makefile.am +++ b/scribo/src/table/Makefile.am @@ -16,14 +16,18 @@ include $(top_srcdir)/scribo/scribo.mk -bin_PROGRAMS = \ - erase \ - extract \ - rebuild_opening \ - rebuild_rank +bin_PROGRAMS = - -erase_SOURCES = erase.cc -extract_SOURCES = extract.cc -rebuild_opening_SOURCES = rebuild_opening.cc -rebuild_rank_SOURCES = rebuild_rank.cc +# Disabled: +#---------- +# +#bin_PROGRAMS = \ +# erase \ +# extract \ +# rebuild_opening \ +# rebuild_rank +# +#erase_SOURCES = erase.cc +#extract_SOURCES = extract.cc +#rebuild_opening_SOURCES = rebuild_opening.cc +#rebuild_rank_SOURCES = rebuild_rank.cc diff --git a/scribo/tests/Makefile.am b/scribo/tests/Makefile.am index d16453c..dccf920 100644 --- a/scribo/tests/Makefile.am +++ b/scribo/tests/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 2010 EPITA Research and Development Laboratory +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory # (LRDE). # # This file is part of Olena. @@ -23,14 +23,11 @@ SUBDIRS = \ filter \ preprocessing \ primitive \ + table \ text \ toolchain \ unit_test -# Disabled directories: -# -# table - # Regen files recursively. include $(top_srcdir)/build-aux/regen-recursive.mk REGEN_SUBDIRS += unit_test diff --git a/scribo/tests/table/Makefile.am b/scribo/tests/table/Makefile.am index 3427e6b..d7564e1 100644 --- a/scribo/tests/table/Makefile.am +++ b/scribo/tests/table/Makefile.am @@ -16,11 +16,13 @@ include $(top_srcdir)/scribo/tests/tests.mk -check_PROGRAMS = \ - extract_lines_with_rank \ - repair_lines +check_PROGRAMS = -extract_lines_with_rank_SOURCES = extract_lines_with_rank.cc -repair_lines_SOURCES = repair_lines.cc +# check_PROGRAMS = \ +# extract_lines_with_rank \ +# repair_lines + +# extract_lines_with_rank_SOURCES = extract_lines_with_rank.cc +# repair_lines_SOURCES = repair_lines.cc TESTS = $(check_PROGRAMS) -- 1.5.6.5