Commit 12d0a854 authored by Roland Levillain's avatar Roland Levillain
Browse files

Use AM_DEFAULT_SOURCE_EXT to simplify Scribo's Makefiles.

	* common.mk: New.
	Include it...
	* scribo.mk,
	* tests/tests.mk:
	...here.
	* src/Makefile.am,
	* src/binarization/Makefile.am,
	* src/debug/Makefile.am,
	* src/filter/Makefile.am,
	* src/misc/Makefile.am,
	* src/multi_scale/Makefile.am,
	* src/preprocessing/Makefile.am,
	* src/primitive/extract/Makefile.am,
	* src/primitive/find/Makefile.am,
	* src/primitive/group/Makefile.am,
	* src/table/Makefile.am,
	* src/text/Makefile.am,
	* tests/filter/Makefile.am,
	* tests/preprocessing/Makefile.am,
	* tests/table/Makefile.am:
	Remove (now useless) `*_SOURCES' variables using
	sed -ri '/^(\s|#)*\S+_SOURCES\s*=\s*\S+.cc\s*$/d'.
	* tests/unit_test/build_unit_test.sh: No longer output `*_SOURCES'
	variables.
	* tests/unit_test/unit-tests.mk: Regen.
parent 245453d3
2010-04-22 Roland Levillain <roland@lrde.epita.fr>
Use AM_DEFAULT_SOURCE_EXT to simplify Scribo's Makefiles.
* common.mk: New.
Include it...
* scribo.mk,
* tests/tests.mk:
...here.
* src/Makefile.am,
* src/binarization/Makefile.am,
* src/debug/Makefile.am,
* src/filter/Makefile.am,
* src/misc/Makefile.am,
* src/preprocessing/Makefile.am,
* src/primitive/extract/Makefile.am,
* src/primitive/find/Makefile.am,
* src/primitive/group/Makefile.am,
* src/table/Makefile.am,
* src/text/Makefile.am,
* tests/filter/Makefile.am,
* tests/preprocessing/Makefile.am,
* tests/table/Makefile.am:
Remove (now useless) `*_SOURCES' variables using
sed -ri '/^(\s|#)*\S+_SOURCES\s*=\s*\S+.cc\s*$/d'.
2013-02-07 Roland Levillain <roland@lrde.epita.fr>
Remove scoria from Makefiles.
......
## common.mk -*- Makefile-Automake -*-
## Common Automake parameters.
## Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE).
##
## This file is part of Olena.
##
## Olena is free software: you can redistribute it and/or modify it under
## the terms of the GNU General Public License as published by the Free
## Software Foundation, version 2 of the License.
##
## Olena is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
## General Public License for more details.
##
## You should have received a copy of the GNU General Public License
## along with Olena. If not, see <http://www.gnu.org/licenses/>.
# C++ sources.
AM_DEFAULT_SOURCE_EXT = .cc
......@@ -15,6 +15,7 @@
# 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)/scribo/common.mk
# Add path to Scribo's headers
AM_CPPFLAGS = \
......
......@@ -41,7 +41,6 @@ if HAVE_MAGICKXX
if HAVE_TESSERACT
utilexec_PROGRAMS += pbm_text_in_doc
pbm_text_in_doc_SOURCES = pbm_text_in_doc.cc
pbm_text_in_doc_CPPFLAGS = $(AM_CPPFLAGS) \
$(TESSERACT_CPPFLAGS) \
$(TIFF_CPPFLAGS) \
......@@ -56,7 +55,6 @@ if HAVE_TESSERACT
endif HAVE_TESSERACT
utilexec_PROGRAMS += text_in_doc_preprocess
text_in_doc_preprocess_SOURCES = text_in_doc_preprocess.cc
text_in_doc_preprocess_CPPFLAGS = $(AM_CPPFLAGS) \
$(MAGICKXX_CPPFLAGS)
text_in_doc_preprocess_LDFLAGS = $(AM_LDFLAGS) \
......@@ -65,7 +63,6 @@ endif HAVE_TESSERACT
utilexec_PROGRAMS += text_in_picture
text_in_picture_SOURCES = text_in_picture.cc
text_in_picture_CPPFLAGS = $(AM_CPPFLAGS) \
$(MAGICKXX_CPPFLAGS)
text_in_picture_LDFLAGS = $(AM_LDFLAGS) \
......@@ -74,7 +71,6 @@ endif HAVE_TESSERACT
utilexec_PROGRAMS += text_in_picture_neg
text_in_picture_neg_SOURCES = text_in_picture_neg.cc
text_in_picture_neg_CPPFLAGS = $(AM_CPPFLAGS) \
$(MAGICKXX_CPPFLAGS)
text_in_picture_neg_LDFLAGS = $(AM_LDFLAGS) \
......@@ -85,7 +81,6 @@ endif HAVE_TESSERACT
if HAVE_TESSERACT
utilexec_PROGRAMS += text_recognition_in_picture
text_recognition_in_picture_SOURCES = text_recognition_in_picture.cc
text_recognition_in_picture_CPPFLAGS = $(AM_CPPFLAGS) \
$(TESSERACT_CPPFLAGS) \
$(TIFF_CPPFLAGS) \
......@@ -100,7 +95,6 @@ if HAVE_TESSERACT
if HAVE_QT
utilexec_PROGRAMS += content_in_doc
content_in_doc_SOURCES = content_in_doc.cc
content_in_doc_CPPFLAGS = $(AM_CPPFLAGS) \
$(TESSERACT_CPPFLAGS) \
$(TIFF_CPPFLAGS) \
......@@ -118,7 +112,6 @@ if HAVE_QT
$(QT_LIBS)
utilexec_PROGRAMS += content_in_hdoc
content_in_hdoc_SOURCES = content_in_hdoc.cc
content_in_hdoc_CPPFLAGS = $(AM_CPPFLAGS) \
$(TESSERACT_CPPFLAGS) \
$(TIFF_CPPFLAGS) \
......@@ -137,7 +130,6 @@ if HAVE_QT
utilexec_PROGRAMS += non_text_components
non_text_components_SOURCES = non_text_components.cc
non_text_components_CPPFLAGS = $(AM_CPPFLAGS) \
$(TESSERACT_CPPFLAGS) \
$(TIFF_CPPFLAGS) \
......
......@@ -29,13 +29,6 @@ noinst_PROGRAMS = \
pgm_global_threshold_auto_SOURCES = pgm_global_threshold_auto.cc
pgm_sauvola_SOURCES = pgm_sauvola.cc
pgm_sauvola_ms_SOURCES = pgm_sauvola_ms.cc
pgm_sauvola_threshold_image_SOURCES = pgm_sauvola_threshold_image.cc
ppm_sauvola_SOURCES = ppm_sauvola.cc
ppm_sauvola_ms_fg_SOURCES = ppm_sauvola_ms_fg.cc
ppm_sauvola_ms_SOURCES = ppm_sauvola_ms.cc
ppm_sauvola_ms_split_SOURCES = ppm_sauvola_ms_split.cc
if HAVE_MAGICKXX
......@@ -51,19 +44,16 @@ if HAVE_MAGICKXX
sauvola_ms_split
sauvola_ms_fg_SOURCES = sauvola_ms_fg.cc
sauvola_ms_fg_CPPFLAGS = $(AM_CPPFLAGS) \
$(MAGICKXX_CPPFLAGS)
sauvola_ms_fg_LDFLAGS = $(AM_LDFLAGS) \
$(MAGICKXX_LDFLAGS)
sauvola_SOURCES = sauvola.cc
sauvola_CPPFLAGS = $(AM_CPPFLAGS) \
$(MAGICKXX_CPPFLAGS)
sauvola_LDFLAGS = $(AM_LDFLAGS) \
$(MAGICKXX_LDFLAGS)
sauvola_debug_SOURCES = sauvola_debug.cc
sauvola_debug_CPPFLAGS = $(AM_CPPFLAGS) \
-DSCRIBO_SAUVOLA_DEBUG \
$(MAGICKXX_CPPFLAGS)
......@@ -71,13 +61,11 @@ if HAVE_MAGICKXX
$(MAGICKXX_LDFLAGS)
sauvola_ms_SOURCES = sauvola_ms.cc
sauvola_ms_CPPFLAGS = $(AM_CPPFLAGS) \
$(MAGICKXX_CPPFLAGS)
sauvola_ms_LDFLAGS = $(AM_LDFLAGS) \
$(MAGICKXX_LDFLAGS)
sauvola_ms_debug_SOURCES = sauvola_ms_debug.cc
sauvola_ms_debug_CPPFLAGS = $(AM_CPPFLAGS) \
-DSCRIBO_SAUVOLA_DEBUG \
$(MAGICKXX_CPPFLAGS)
......@@ -85,7 +73,6 @@ if HAVE_MAGICKXX
$(MAGICKXX_LDFLAGS)
sauvola_ms_split_SOURCES = sauvola_ms_split.cc
sauvola_ms_split_CPPFLAGS = $(AM_CPPFLAGS) \
$(MAGICKXX_CPPFLAGS)
sauvola_ms_split_LDFLAGS = $(AM_LDFLAGS) \
......@@ -93,4 +80,3 @@ if HAVE_MAGICKXX
endif HAVE_MAGICKXX
......@@ -51,43 +51,11 @@ noinst_PROGRAMS = \
show_objects_thin
show_components_bboxes_SOURCES = show_components_bboxes.cc
show_groups_bboxes_SOURCES = show_groups_bboxes.cc
show_groups_bboxes_filtered_SOURCES = show_groups_bboxes_filtered.cc
show_info_x_height_SOURCES = show_info_x_height.cc
show_info_median_inter_characters_SOURCES = show_info_median_inter_characters.cc
show_separators_SOURCES = show_separators.cc
show_links_left_right_links_validation_SOURCES = show_links_left_right_links_validation.cc
show_links_bbox_h_ratio_SOURCES = show_links_bbox_h_ratio.cc
show_links_bbox_overlap_SOURCES = show_links_bbox_overlap.cc
show_links_bottom_aligned_SOURCES = show_links_bottom_aligned.cc
show_links_bottom_aligned_2angles_SOURCES = show_links_bottom_aligned_2angles.cc
show_links_center_aligned_SOURCES = show_links_center_aligned.cc
show_links_non_h_aligned_SOURCES = show_links_non_h_aligned.cc
show_links_several_right_overlap_SOURCES = show_links_several_right_overlap.cc
show_links_single_down_SOURCES = show_links_single_down.cc
show_links_single_down_left_aligned_SOURCES = show_links_single_down_left_aligned.cc
show_links_single_down_right_aligned_SOURCES = show_links_single_down_right_aligned.cc
show_links_single_left_SOURCES = show_links_single_left.cc
show_links_single_left_dmax_ratio_SOURCES = show_links_single_left_dmax_ratio.cc
show_links_single_right_SOURCES = show_links_single_right.cc
show_links_single_right_dmax_ratio_SOURCES = show_links_single_right_dmax_ratio.cc
show_links_single_up_SOURCES = show_links_single_up.cc
show_links_single_up_left_aligned_SOURCES = show_links_single_up_left_aligned.cc
show_links_single_up_right_aligned_SOURCES = show_links_single_up_right_aligned.cc
show_links_top_aligned_SOURCES = show_links_top_aligned.cc
show_links_top_aligned_2angles_SOURCES = show_links_top_aligned_2angles.cc
show_objects_large_SOURCES = show_objects_large.cc
show_objects_large_small_SOURCES = show_objects_large_small.cc
show_objects_small_SOURCES = show_objects_small.cc
show_objects_thick_SOURCES = show_objects_thick.cc
show_objects_thin_SOURCES = show_objects_thin.cc
if HAVE_MAGICKXX
noinst_PROGRAMS += show_lines_boldness
show_lines_boldness_SOURCES = show_lines_boldness.cc
show_lines_boldness_CPPFLAGS = $(AM_CPPFLAGS) \
$(MAGICKXX_CPPFLAGS)
show_lines_boldness_LDFLAGS = $(AM_LDFLAGS) \
......@@ -95,14 +63,12 @@ if HAVE_MAGICKXX
noinst_PROGRAMS += show_components_color
show_components_color_SOURCES = show_components_color.cc
show_components_color_CPPFLAGS = $(AM_CPPFLAGS) \
$(MAGICKXX_CPPFLAGS)
show_components_color_LDFLAGS = $(AM_LDFLAGS) \
$(MAGICKXX_LDFLAGS)
noinst_PROGRAMS += show_components_boldness
show_components_boldness_SOURCES = show_components_boldness.cc
show_components_boldness_CPPFLAGS = $(AM_CPPFLAGS) \
$(MAGICKXX_CPPFLAGS)
show_components_boldness_LDFLAGS = $(AM_LDFLAGS) \
......@@ -111,7 +77,6 @@ if HAVE_MAGICKXX
if HAVE_QT
noinst_PROGRAMS += show_paragraph_blocks
show_paragraph_blocks_SOURCES = show_paragraph_blocks.cc
show_paragraph_blocks_CPPFLAGS = $(AM_CPPFLAGS) \
$(QT_CPPFLAGS) \
$(MAGICKXX_CPPFLAGS)
......@@ -125,7 +90,6 @@ if HAVE_QT
if HAVE_TESSERACT
noinst_PROGRAMS += show_text_lines
show_text_lines_SOURCES = show_text_lines.cc
show_text_lines_CPPFLAGS = $(AM_CPPFLAGS) \
$(MAGICKXX_CPPFLAGS) \
$(TESSERACT_CPPFLAGS) \
......@@ -139,7 +103,6 @@ if HAVE_TESSERACT
$(QT_LIBS)
noinst_PROGRAMS += show_text_lines_wo_seps
show_text_lines_wo_seps_SOURCES = show_text_lines_wo_seps.cc
show_text_lines_wo_seps_CPPFLAGS = $(AM_CPPFLAGS) \
$(MAGICKXX_CPPFLAGS) \
$(TESSERACT_CPPFLAGS) \
......@@ -155,7 +118,6 @@ endif HAVE_TESSERACT
noinst_PROGRAMS += show_stoppers
show_stoppers_SOURCES = show_stoppers.cc
show_stoppers_CPPFLAGS = $(AM_CPPFLAGS) \
$(MAGICKXX_CPPFLAGS) \
$(QT_CPPFLAGS)
......@@ -172,7 +134,6 @@ endif HAVE_QT
noinst_PROGRAMS += highlight_text_area
highlight_text_area_SOURCES = highlight_text_area.cc
highlight_text_area_CPPFLAGS = $(AM_CPPFLAGS) \
$(MAGICKXX_CPPFLAGS)
highlight_text_area_LDFLAGS = $(AM_LDFLAGS) \
......
......@@ -24,10 +24,3 @@ noinst_PROGRAMS = \
objects_thin \
objects_with_holes \
objects_with_holes_pgm
objects_large_SOURCES = objects_large.cc
objects_small_SOURCES = objects_small.cc
objects_thick_SOURCES = objects_thick.cc
objects_thin_SOURCES = objects_thin.cc
objects_with_holes_SOURCES = objects_with_holes.cc
objects_with_holes_pgm_SOURCES = objects_with_holes_pgm.cc
......@@ -24,10 +24,3 @@ noinst_PROGRAMS = \
negate \
rectangularity \
superpose
closure_rectangle_SOURCES = closure_rectangle.cc
dmap_SOURCES = dmap.cc
morpho_SOURCES = morpho.cc
negate_SOURCES = negate.cc
rectangularity_SOURCES = rectangularity.cc
superpose_SOURCES = superpose.cc
......@@ -24,16 +24,10 @@ noinst_PROGRAMS = \
preprocess \
unskew
denoise_bg_SOURCES = denoise_bg.cc
denoise_fg_SOURCES = denoise_fg.cc
homogeneous_contrast_SOURCES = homogeneous_contrast.cc
preprocess_SOURCES = preprocess.cc
unskew_SOURCES = unskew.cc
if HAVE_MAGICKXX
noinst_PROGRAMS += split_bg_fg
split_bg_fg_SOURCES = split_bg_fg.cc
split_bg_fg_CPPFLAGS = $(AM_CPPFLAGS) \
$(MAGICKXX_CPPFLAGS)
split_bg_fg_LDFLAGS = $(AM_LDFLAGS) \
......@@ -41,7 +35,6 @@ if HAVE_MAGICKXX
-lpthread
noinst_PROGRAMS += rotate
rotate_SOURCES = rotate.cc
rotate_CPPFLAGS = $(AM_CPPFLAGS) \
$(MAGICKXX_CPPFLAGS)
rotate_LDFLAGS = $(AM_LDFLAGS) \
......@@ -49,7 +42,6 @@ if HAVE_MAGICKXX
-lpthread
noinst_PROGRAMS += rotate_90
rotate_90_SOURCES = rotate_90.cc
rotate_90_CPPFLAGS = $(AM_CPPFLAGS) \
$(MAGICKXX_CPPFLAGS)
rotate_90_LDFLAGS = $(AM_LDFLAGS) \
......@@ -57,7 +49,6 @@ if HAVE_MAGICKXX
-lpthread
noinst_PROGRAMS += to_pgm
to_pgm_SOURCES = to_pgm.cc
to_pgm_CPPFLAGS = $(AM_CPPFLAGS) \
$(MAGICKXX_CPPFLAGS)
to_pgm_LDFLAGS = $(AM_LDFLAGS) \
......@@ -65,7 +56,6 @@ if HAVE_MAGICKXX
-lpthread
noinst_PROGRAMS += subsample
subsample_SOURCES = subsample.cc
subsample_CPPFLAGS = $(AM_CPPFLAGS) \
$(MAGICKXX_CPPFLAGS)
subsample_LDFLAGS = $(AM_LDFLAGS) \
......
......@@ -29,21 +29,10 @@ noinst_PROGRAMS = \
lines_thick_and_thin \
lines_pattern
discontinued_lines_SOURCES = discontinued_lines.cc
discontinued_vlines_SOURCES = discontinued_vlines.cc
discontinued_hlines_SOURCES = discontinued_hlines.cc
separators_nonvisible_SOURCES = separators_nonvisible.cc
thick_vlines_SOURCES = thick_vlines.cc
thick_hlines_SOURCES = thick_hlines.cc
lines_h_thick_and_thin_SOURCES = lines_h_thick_and_thin.cc
lines_thick_and_thin_SOURCES = lines_thick_and_thin.cc
lines_pattern_SOURCES = lines_pattern.cc
if HAVE_MAGICKXX
noinst_PROGRAMS += alignments
alignments_SOURCES = alignments.cc
alignments_CPPFLAGS = $(AM_CPPFLAGS) \
$(MAGICKXX_CPPFLAGS)
alignments_LDFLAGS = $(AM_LDFLAGS) \
......
......@@ -24,9 +24,3 @@ noinst_PROGRAMS = \
find_single_lines \
find_thick_lines \
find_thick_and_single_lines
find_discontinued_lines_SOURCES = find_discontinued_lines.cc
find_pattern_lines_SOURCES = find_pattern_lines.cc
find_single_lines_SOURCES = find_single_lines.cc
find_thick_lines_SOURCES = find_thick_lines.cc
find_thick_and_single_lines_SOURCES = find_thick_and_single_lines.cc
......@@ -23,15 +23,8 @@ noinst_PROGRAMS = \
group_from_several_left_links \
group_from_single_link
group_from_double_link_SOURCES = group_from_double_link.cc
group_from_double_several_links_SOURCES = group_from_double_several_links.cc
group_from_several_left_links_SOURCES = group_from_several_left_links.cc
group_from_single_link_SOURCES = group_from_single_link.cc
## FIXME: Does not compile.
## bin_PROGRAMS += group_from_rag \
## group_from_graph \
## group_from_several_graph \
## group_from_rag_SOURCES = group_from_rag.cc
## group_from_graph_SOURCES = group_from_graph.cc
## group_from_several_graph_SOURCES = group_from_several_graph.cc
\ No newline at end of file
## group_from_several_graph
......@@ -27,8 +27,3 @@ noinst_PROGRAMS =
# 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
......@@ -21,14 +21,10 @@ noinst_PROGRAMS = \
cleantxt
cleantxt_SOURCES = cleantxt.cc
if HAVE_TESSERACT
if HAVE_TIFF
noinst_PROGRAMS += pbm_lines_recognition
pbm_lines_recognition_SOURCES = pbm_lines_recognition.cc
pbm_lines_recognition_CPPFLAGS = $(AM_CPPFLAGS) \
$(TESSERACT_CPPFLAGS) \
$(TIFF_CPPFLAGS) \
......@@ -39,7 +35,6 @@ if HAVE_TIFF
-lpthread
noinst_PROGRAMS += pbm_recognition
pbm_recognition_SOURCES = pbm_recognition.cc
pbm_recognition_CPPFLAGS = $(AM_CPPFLAGS) \
$(TESSERACT_CPPFLAGS) \
$(TIFF_CPPFLAGS) \
......
......@@ -35,22 +35,4 @@ check_PROGRAMS = \
components_small \
components_large
objects_with_holes_SOURCES = objects_with_holes.cc
objects_on_border_SOURCES = objects_on_border.cc
object_links_bbox_h_ratio_SOURCES = object_links_bbox_h_ratio.cc
object_links_bbox_w_ratio_SOURCES = object_links_bbox_w_ratio.cc
object_links_bbox_overlap_SOURCES = object_links_bbox_overlap.cc
object_links_bottom_aligned_SOURCES = object_links_bottom_aligned.cc
object_links_center_aligned_SOURCES = object_links_center_aligned.cc
object_links_left_aligned_SOURCES = object_links_left_aligned.cc
object_links_right_aligned_SOURCES = object_links_right_aligned.cc
object_links_top_aligned_SOURCES = object_links_top_aligned.cc
object_groups_mean_width_SOURCES = object_groups_mean_width.cc
object_groups_size_ratio_SOURCES = object_groups_size_ratio.cc
object_groups_small_SOURCES = object_groups_small.cc
object_groups_with_holes_SOURCES = object_groups_with_holes.cc
components_small_SOURCES = components_small.cc
components_large_SOURCES = components_large.cc
TESTS = $(check_PROGRAMS)
......@@ -22,11 +22,6 @@ check_PROGRAMS = \
rotate_90 \
deskew
crop_SOURCES = crop.cc
crop_without_localization_SOURCES = crop_without_localization.cc
rotate_90_SOURCES = rotate_90.cc
deskew_SOURCES = deskew.cc
TESTS = $(check_PROGRAMS)
MOSTLYCLEANFILES = unskew.pbm
# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
......@@ -22,7 +22,4 @@ 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)
......@@ -19,6 +19,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)/scribo/common.mk
AM_CPPFLAGS = \
-I$(top_srcdir)/scribo \
-I$(top_builddir)/scribo\
......
Supports Markdown
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