* scribo.mk: Set optimization flags in AM_CXXFLAGS. * tests/tests.mk: New. Set AM_CXXFLAGS with debug flags. * tests/Makefile.am, * tests/filter/Makefile.am, * tests/preprocessing/Makefile.am, * tests/table/Makefile.am, * tests/text/Makefile.am, * tests/unit_test/Makefile.am: Include tests.mk. --- scribo/ChangeLog | 14 ++++++++++++++ scribo/scribo.mk | 4 ++-- scribo/tests/Makefile.am | 3 ++- scribo/tests/filter/Makefile.am | 2 +- scribo/tests/preprocessing/Makefile.am | 2 +- scribo/tests/table/Makefile.am | 4 ++-- scribo/{scribo.mk => tests/tests.mk} | 6 ++---- scribo/tests/text/Makefile.am | 2 +- scribo/tests/unit_test/Makefile.am | 2 +- 9 files changed, 26 insertions(+), 13 deletions(-) copy scribo/{scribo.mk => tests/tests.mk} (85%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 24f7305..0aae996 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,19 @@ 2009-08-25 Guillaume Lazzara <lazzara@lrde.epita.fr> + Set specific cxxflags for tests in Scribo. + + * scribo.mk: Set optimization flags in AM_CXXFLAGS. + * tests/tests.mk: New. Set AM_CXXFLAGS with debug flags. + + * tests/Makefile.am, + * tests/filter/Makefile.am, + * tests/preprocessing/Makefile.am, + * tests/table/Makefile.am, + * tests/text/Makefile.am, + * tests/unit_test/Makefile.am: Include tests.mk. + +2009-08-25 Guillaume Lazzara <lazzara@lrde.epita.fr> + Introduce new structures for objects links and groups. * core/object_groups.hh, diff --git a/scribo/scribo.mk b/scribo/scribo.mk index 2984fb4..62ffcad 100644 --- a/scribo/scribo.mk +++ b/scribo/scribo.mk @@ -14,8 +14,8 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -#include $(top_srcdir)/milena/tests/tests.mk # Add path to Scribo's headers -AM_CPPFLAGS = -I$(top_srcdir)/ -I$(top_builddir)/ -I$(top_srcdir)/milena -I$(top_builddir)/milena -DNDEBUG -O2 +AM_CPPFLAGS = -I$(top_srcdir)/ -I$(top_builddir)/ -I$(top_srcdir)/milena -I$(top_builddir)/milena +AM_CXXFLAGS = -DNDEBUG -O2 \ No newline at end of file diff --git a/scribo/tests/Makefile.am b/scribo/tests/Makefile.am index 2351ce9..e36d250 100644 --- a/scribo/tests/Makefile.am +++ b/scribo/tests/Makefile.am @@ -13,7 +13,8 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# + +include $(srcdir)/tests.mk ## Process this file through Automake to create Makefile.in. diff --git a/scribo/tests/filter/Makefile.am b/scribo/tests/filter/Makefile.am index 465c42f..fd3299e 100644 --- a/scribo/tests/filter/Makefile.am +++ b/scribo/tests/filter/Makefile.am @@ -17,7 +17,7 @@ ## Process this file through Automake to create Makefile.in. -include $(top_srcdir)/scribo/scribo.mk +include $(top_srcdir)/scribo/tests/tests.mk check_PROGRAMS = \ small_and_large_bboxes diff --git a/scribo/tests/preprocessing/Makefile.am b/scribo/tests/preprocessing/Makefile.am index e0ee097..4666033 100644 --- a/scribo/tests/preprocessing/Makefile.am +++ b/scribo/tests/preprocessing/Makefile.am @@ -17,7 +17,7 @@ ## Process this file through Automake to create Makefile.in. -include $(top_srcdir)/scribo/scribo.mk +include $(top_srcdir)/scribo/tests/tests.mk check_PROGRAMS = \ unskew diff --git a/scribo/tests/table/Makefile.am b/scribo/tests/table/Makefile.am index 8016c9b..0c15a63 100644 --- a/scribo/tests/table/Makefile.am +++ b/scribo/tests/table/Makefile.am @@ -17,12 +17,12 @@ ## Process this file through Automake to create Makefile.in. -include $(top_srcdir)/scribo/scribo.mk +include $(top_srcdir)/scribo/tests/tests.mk check_PROGRAMS = \ extract_lines_with_rank \ repair_lines - + extract_lines_with_rank_SOURCES = extract_lines_with_rank.cc repair_lines_SOURCES = repair_lines.cc diff --git a/scribo/scribo.mk b/scribo/tests/tests.mk similarity index 85% copy from scribo/scribo.mk copy to scribo/tests/tests.mk index 2984fb4..bc9b2d9 100644 --- a/scribo/scribo.mk +++ b/scribo/tests/tests.mk @@ -14,8 +14,6 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -#include $(top_srcdir)/milena/tests/tests.mk - -# Add path to Scribo's headers -AM_CPPFLAGS = -I$(top_srcdir)/ -I$(top_builddir)/ -I$(top_srcdir)/milena -I$(top_builddir)/milena -DNDEBUG -O2 +AM_CPPFLAGS = -I$(top_srcdir)/ -I$(top_builddir)/ -I$(top_srcdir)/milena -I$(top_builddir)/milena +AM_CXXFLAGS = -g -O0 diff --git a/scribo/tests/text/Makefile.am b/scribo/tests/text/Makefile.am index c478091..f6cb0e5 100644 --- a/scribo/tests/text/Makefile.am +++ b/scribo/tests/text/Makefile.am @@ -17,7 +17,7 @@ ## Process this file through Automake to create Makefile.in. -include $(top_srcdir)/scribo/scribo.mk +include $(top_srcdir)/scribo/tests/tests.mk check_PROGRAMS = diff --git a/scribo/tests/unit_test/Makefile.am b/scribo/tests/unit_test/Makefile.am index 79b3830..7202de6 100644 --- a/scribo/tests/unit_test/Makefile.am +++ b/scribo/tests/unit_test/Makefile.am @@ -17,7 +17,7 @@ ## Process this file through Automake to create Makefile.in. -include $(top_srcdir)/scribo/scribo.mk +include $(top_srcdir)/scribo/tests/tests.mk # Regen files. include $(top_srcdir)/build-aux/regen-recursive.mk -- 1.5.6.5