Commit e0131fc7 authored by Roland Levillain's avatar Roland Levillain
Browse files

Make Milena more compatible with BSD Make.

	* apps/bench/Makefile.am,
	* apps/morphers/Makefile.am,
	* doc/Makefile.am,
	* doc/gen-examples-outputs-mk,
	* doc/gen-figures-mk,
	* doc/gen-split-examples-mk,
	* doc/gen-split-outputs-mk:
	Do not use `$<' outside suffix rules.
	* apps/papers/levillain.09.ismm/Makefile.am: Likewise.
	Add explicit `$(srcdir)/' prefixes to prerequisites' paths.
	* milena/Makefile.am,
	* milena/tests/unit_test/Makefile.am:
	Adjust comments.
parent 45bcbda3
2014-06-26 Roland Levillain <roland@lrde.epita.fr>
Make Milena more compatible with BSD Make.
* apps/bench/Makefile.am,
* apps/morphers/Makefile.am,
* doc/Makefile.am,
* doc/gen-examples-outputs-mk,
* doc/gen-figures-mk,
* doc/gen-split-examples-mk,
* doc/gen-split-outputs-mk:
Do not use `$<' outside suffix rules.
* apps/papers/levillain.09.ismm/Makefile.am: Likewise.
Add explicit `$(srcdir)/' prefixes to prerequisites' paths.
* milena/Makefile.am,
* milena/tests/unit_test/Makefile.am:
Adjust comments.
2014-06-25 Roland Levillain <roland@lrde.epita.fr>
 
Convert Milena to UTF-8.
# Copyright (C) 2007, 2008, 2009, 2012, 2013 EPITA Research and Development
# Laboratory (LRDE).
# Copyright (C) 2007, 2008, 2009, 2012, 2013, 2014 EPITA Research and
# Development Laboratory (LRDE).
#
# This file is part of Olena.
#
......@@ -74,7 +74,8 @@ regen-am:
# FIXME: Change generate_dist_headers.sh so that the action looks like this:
#
# $< $@.tmp && mv -f $@.tmp $@ && chmod -w $@
# $(top_srcdir)/build-aux/generate_dist_headers.sh \
# $@.tmp && mv -f $@.tmp $@ && chmod -w $@
#
$(srcdir)/headers.mk: $(top_srcdir)/build-aux/generate_dist_headers.sh
cd $(srcdir) \
......
# Copyright (C) 2010, 2011 EPITA Research and Development Laboratory (LRDE).
# Copyright (C) 2010, 2011, 2014 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
#
......@@ -108,8 +109,8 @@ EXTRA_DIST += test-dilation-lena-bench.in
test-dilation-lena-bench: test-dilation-lena-bench.in Makefile
rm -f $@ $@.tmp
srcdir=''; \
test -f ./$< || srcdir=$(srcdir)/; \
$(edit) $${srcdir}$< >>$@.tmp
test -f ./test-dilation-lena-bench.in || srcdir=$(srcdir)/; \
$(edit) $${srcdir}test-dilation-lena-bench.in >>$@.tmp
chmod a-w,a+x $@.tmp
mv $@.tmp $@
CLEANFILES = test-dilation-lena-bench
......
# Copyright (C) 2011, 2012, 2013 EPITA Research and Development
# Copyright (C) 2011, 2012, 2013, 2014 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
......@@ -40,7 +40,7 @@ iz_LDFLAGS = $(AM_LDFLAGS) $(MAGICKXX_LDFLAGS)
# This target is phony: `iz' never writes `iz_output.ppm' actually.
iz_output.ppm: iz$(EXEEXT) iz_input.pbm
./$< $(srcdir)/iz_input.pbm $@
./iz$(EXEEXT) $(srcdir)/iz_input.pbm $@
# Likewise, the dependency of this target is a (wrong) shortcut.
tmp_iz.avi: iz_output.ppm
mencoder "mf://tmp_iz*.png" -o tmp_iz.avi -ovc lavc -lavcopts vcodec=mjpeg -speed 50
......
# Copyright (C) 2008, 2009, 2010, 2011, 2013 EPITA Research and Development
# Laboratory (LRDE).
# Copyright (C) 2008, 2009, 2010, 2011, 2013, 2014 EPITA Research and
# Development Laboratory (LRDE).
#
# This file is part of Olena.
#
......@@ -40,18 +40,18 @@ MOSTLYCLEANFILES = $(noinst_DATA) graph-s.neato
# FIXME: Also generate intermediate images (gradients, etc.).
lena-s.ppm: $(top_srcdir)/milena/img/lena.pgm image2d$(EXEEXT)
./image2d$(EXEEXT) $< 1000 $@
./image2d$(EXEEXT) $(top_srcdir)/milena/img/lena.pgm 1000 $@
graph-s.png: graph-s.neato
neato -Tpng $< >$@
graph-s.neato: seeds.pgm graph$(EXEEXT)
./graph$(EXEEXT) $< 2 $@
neato -Tpng graph-s.neato >$@
graph-s.neato: $(srcdir)/seeds.pgm graph$(EXEEXT)
./graph$(EXEEXT) $(srcdir)/seeds.pgm 2 $@
m283-s.off: m283-c.off complex$(EXEEXT)
./complex$(EXEEXT) $< 100 $@
m283-s.off: $(srcdir)/m283-c.off complex$(EXEEXT)
./complex$(EXEEXT) $(srcdir)/m283-c.off 100 $@
classwst-graph.ppm: classseedsi.pbm classif-graph$(EXEEXT)
./classif-graph$(EXEEXT) $< 4 $@
classwst-graph.ppm: $(srcdir)/classseedsi.pbm classif-graph$(EXEEXT)
./classif-graph$(EXEEXT) $(srcdir)/classseedsi.pbm 4 $@
classwst-1complex.ppm: classseedsi.pbm classif-1complex$(EXEEXT)
./classif-1complex$(EXEEXT) $< 4 $@
classwst-1complex.ppm: $(srcdir)/classseedsi.pbm classif-1complex$(EXEEXT)
./classif-1complex$(EXEEXT) $(srcdir)/classseedsi.pbm 4 $@
......@@ -229,7 +229,7 @@ edit = sed -e "s|@ID[@]|$(ID)|" \
-e 's,@boostcppflags[@],$(BOOST_CPPFLAGS),g'
$(DOXYFILE_USER): $(srcdir)/$(DOXYFILE).in
$(edit) $< >$@
$(edit) $(srcdir)/$(DOXYFILE).in >$@
MAINTAINERCLEANFILES += $(DOXYFILE_USER)
USER_REFMAN = user-refman
......@@ -273,8 +273,8 @@ $(srcdir)/user-refman.stamp: $(srcdir)/$(DOXYFILE).in $(REFMAN_deps)
$(srcdir)/$(USER_REFMAN): $(srcdir)/user-refman.stamp
## Recover from the removal of $@.
@if test -d $@; then :; else \
rm -f $<; \
$(MAKE) $(AM_MAKEFLAGS) $<; \
rm -f $(srcdir)/user-refman.stamp; \
$(MAKE) $(AM_MAKEFLAGS) $(srcdir)/user-refman.stamp; \
fi
# Installing a directory located in the source dir is not supported by
......@@ -315,7 +315,7 @@ edit_devel = sed \
$(DOXYFILE_DEVEL): $(srcdir)/$(DOXYFILE).in
rm -f $@.tmp
$(edit) $< >$@.tmp
$(edit) $(srcdir)/$(DOXYFILE).in >$@.tmp
$(edit_devel) $@.tmp >$@
rm -f $@.tmp
MAINTAINERCLEANFILES += $(DOXYFILE_DEVEL)
......@@ -358,8 +358,8 @@ $(srcdir)/devel-refman.stamp: $(srcdir)/$(DOXYFILE).in $(REFMAN_deps)
$(srcdir)/$(DEVEL_REFMAN): $(srcdir)/devel-refman.stamp
## Recover from the removal of $@.
@if test -d $@; then :; else \
rm -f $<; \
$(MAKE) $(AM_MAKEFLAGS) $<; \
rm -f $(srcdir)/devel-refman.stamp; \
$(MAKE) $(AM_MAKEFLAGS) $(srcdir)/devel-refman.stamp; \
fi
......@@ -393,7 +393,7 @@ $(srcdir)/$(TECHNICAL).stamp: $(srcdir)/technical.tex $(TECHNICAL_deps)
rm -rf $(TECHNICAL).tmp
mkdir $(TECHNICAL).tmp
$(TEXI2HTML) $(TEXI2HTML_FLAGS) \
-o $(TECHNICAL).tmp/$(TECHNICAL).html $<
-o $(TECHNICAL).tmp/$(TECHNICAL).html $(srcdir)/technical.tex
rm -rf $(srcdir)/$(TECHNICAL)
## FIXME: moving directories between file systems is not portable.
mv $(TECHNICAL).tmp $(srcdir)/$(TECHNICAL)
......@@ -404,8 +404,8 @@ MAINTAINERCLEANFILES += $(srcdir)/$(TECHNICAL).stamp
$(srcdir)/$(TECHNICAL): $(srcdir)/$(TECHNICAL).stamp
## Recover from the removal of $@.
@if test -d $@; then :; else \
rm -f $<; \
$(MAKE) $(AM_MAKEFLAGS) $<; \
rm -f $(srcdir)/$(TECHNICAL).stamp; \
$(MAKE) $(AM_MAKEFLAGS) $(srcdir)/$(TECHNICAL).stamp; \
fi
DATA_html_dirs = $(TECHNICAL)
......@@ -443,7 +443,7 @@ $(srcdir)/$(TUTORIAL).stamp: $(srcdir)/tutorial.tex $(TUTORIAL_deps)
rm -rf $(TUTORIAL).tmp
mkdir $(TUTORIAL).tmp
$(TEXI2HTML) $(TEXI2HTML_FLAGS) \
-o $(TUTORIAL).tmp/$(TUTORIAL).html $<
-o $(TUTORIAL).tmp/$(TUTORIAL).html $(srcdir)/tutorial.tex
rm -rf $(srcdir)/$(TUTORIAL)
## FIXME: moving directories between file systems is not portable.
mv $(TUTORIAL).tmp $(srcdir)/$(TUTORIAL)
......@@ -454,8 +454,8 @@ MAINTAINERCLEANFILES += $(srcdir)/$(TUTORIAL).stamp
$(srcdir)/$(TUTORIAL): $(srcdir)/$(TUTORIAL).stamp
## Recover from the removal of $@.
@if test -d $@; then :; else \
rm -f $<; \
$(MAKE) $(AM_MAKEFLAGS) $<; \
rm -f $(srcdir)/$(TUTORIAL).stamp; \
$(MAKE) $(AM_MAKEFLAGS) $(srcdir)/$(TUTORIAL).stamp; \
fi
DATA_html_dirs += $(TUTORIAL)
......@@ -506,7 +506,7 @@ $(srcdir)/$(WHITE_PAPER).stamp: $(srcdir)/white-paper.tex $(WHITE_PAPER_deps)
mkdir $(WHITE_PAPER).tmp/figures
cp $(WHITE_PAPER_FIGURES) $(WHITE_PAPER).tmp/figures
$(TEXI2HTML) $(TEXI2HTML_FLAGS) \
-o $(WHITE_PAPER).tmp/$(WHITE_PAPER).html $<
-o $(WHITE_PAPER).tmp/$(WHITE_PAPER).html $(srcdir)/white-paper.tex
rm -rf $(srcdir)/$(WHITE_PAPER)
## FIXME: moving directories between file systems is not portable.
mv $(WHITE_PAPER).tmp $(srcdir)/$(WHITE_PAPER)
......@@ -517,8 +517,8 @@ MAINTAINERCLEANFILES += $(srcdir)/$(WHITE_PAPER).stamp
$(srcdir)/$(WHITE_PAPER): $(srcdir)/$(WHITE_PAPER).stamp
## Recover from the removal of $@.
@if test -d $@; then :; else \
rm -f $<; \
$(MAKE) $(AM_MAKEFLAGS) $<; \
rm -f $(srcdir)/$(WHITE_PAPER).stamp; \
$(MAKE) $(AM_MAKEFLAGS) $(srcdir)/$(WHITE_PAPER).stamp; \
fi
DATA_html_dirs += $(WHITE_PAPER)
......@@ -556,7 +556,7 @@ $(srcdir)/$(REF_GUIDE).stamp: $(srcdir)/ref-guide.tex $(REF_GUIDE_deps)
rm -rf $(REF_GUIDE).tmp
mkdir $(REF_GUIDE).tmp
$(TEXI2HTML) $(TEXI2HTML_FLAGS) \
-o $(REF_GUIDE).tmp/$(REF_GUIDE).html $<
-o $(REF_GUIDE).tmp/$(REF_GUIDE).html $(srcdir)/ref-guide.tex
rm -rf $(srcdir)/$(REF_GUIDE)
## FIXME: moving directories between file systems is not portable.
mv $(REF_GUIDE).tmp $(srcdir)/$(REF_GUIDE)
......@@ -567,8 +567,8 @@ MAINTAINERCLEANFILES += $(srcdir)/$(REF_GUIDE).stamp
$(srcdir)/$(REF_GUIDE): $(srcdir)/$(REF_GUIDE).stamp
## Recover from the removal of $@.
@if test -d $@; then :; else \
rm -f $<; \
$(MAKE) $(AM_MAKEFLAGS) $<; \
rm -f $(srcdir)/$(REF_GUIDE).stamp; \
$(MAKE) $(AM_MAKEFLAGS) $(srcdir)/$(REF_GUIDE).stamp; \
fi
DATA_html_dirs += $(REF_GUIDE)
......
#! /bin/sh
# Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE).
# Copyright (C) 2010, 2014 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
......@@ -64,8 +64,8 @@ MAINTAINERCLEANFILES += $timestamp
$output: $timestamp
## Recover from the removal of \$@
@if test -f \$@; then :; else \\
rm -f \$<; \\
\$(MAKE) \$(AM_MAKEFLAGS) \$<; \\
rm -f $timestamp; \\
\$(MAKE) \$(AM_MAKEFLAGS) $timestamp; \\
fi
EOF
done
......@@ -169,8 +169,8 @@ for file in `inputs`; do
\$($fig_var): $timestamp
## Recover from the removal of \$@
@if test -f \$@; then :; else \\
rm -f \$<; \\
\$(MAKE) \$(AM_MAKEFLAGS) \$<; \\
rm -f $timestamp; \\
\$(MAKE) \$(AM_MAKEFLAGS) $timestamp; \\
fi
EOF
......
#! /bin/sh
# Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE).
# Copyright (C) 2010, 2014 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
......@@ -116,7 +116,7 @@ EOF
$timestamp: \$(srcdir)/$file
@rm -f \$@.tmp
@touch \$@.tmp
\$(srcdir)/tools/split_sample.sh \$< cc raw \$(srcdir)/$output_dir
\$(srcdir)/tools/split_sample.sh \$(srcdir)/$file cc raw \$(srcdir)/$output_dir
@mv -f \$@.tmp \$@
EXTRA_DIST += $timestamp
MAINTAINERCLEANFILES += $timestamp
......@@ -124,8 +124,8 @@ MAINTAINERCLEANFILES += $timestamp
$targets: $timestamp
## Recover from the removal of \$@
@if test -f \$@; then :; else \\
rm -f \$<; \\
\$(MAKE) \$(AM_MAKEFLAGS) \$<; \\
rm -f $timestamp; \\
\$(MAKE) \$(AM_MAKEFLAGS) $timestamp; \\
fi
EOF
}
......
......@@ -119,7 +119,7 @@ EOF
$timestamp: $output
@rm -f \$@.tmp
@touch \$@.tmp
\$(srcdir)/tools/split_sample.sh \$< txt "" \$(srcdir)/$output_dir
\$(srcdir)/tools/split_sample.sh $output txt "" \$(srcdir)/$output_dir
@mv -f \$@.tmp \$@
EXTRA_DIST += $timestamp
MAINTAINERCLEANFILES += $timestamp
......@@ -127,8 +127,8 @@ MAINTAINERCLEANFILES += $timestamp
$targets: $timestamp
## Recover from the removal of \$@
@if test -f \$@; then :; else \\
rm -f \$<; \\
\$(MAKE) \$(AM_MAKEFLAGS) \$<; \\
rm -f $timestamp; \\
\$(MAKE) \$(AM_MAKEFLAGS) $timestamp; \\
fi
EOF
}
......
# Copyright (C) 2008, 2009, 2010, 2013 EPITA Research and Development
# Copyright (C) 2008, 2009, 2010, 2013, 2014 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
......@@ -41,7 +41,8 @@ regen-am:
# FIXME: Change build_unit_test.sh so that the action looks like this:
#
# $< $@.tmp && mv -f $@.tmp $@ && chmod -w $@
# $(top_srcdir)/build-aux/build_unit_test.sh \
# $@.tmp && mv -f $@.tmp $@ && chmod -w $@
#
# `$(abs_top_srcdir)' is required because of the change of directory
# at the beginning og the action.
......
# Copyright (C) 2008, 2009, 2010, 2011, 2013 EPITA Research and Development
# Laboratory (LRDE)
# Copyright (C) 2008, 2009, 2010, 2011, 2013, 2014 EPITA Research and
# Development Laboratory (LRDE).
#
# This file is part of Olena.
#
......@@ -58,13 +58,14 @@ simple_point_luts: simple_point3d_lut_26_6.hh
CLEANFILES = simple_point3d_lut_26_6.txt
simple_point3d_lut_26_6.txt: simple_point3d_lut_tbb$(EXEEXT)
./$< 26_6 >$@
./simple_point3d_lut_tbb$(EXEEXT) 26_6 >$@
EXTRA_DIST = gen_cxx_lut
CLEANFILES += simple_point3d_lut_26_6.hh
simple_point3d_lut_26_6.hh: simple_point3d_lut_26_6.txt $(srcdir)/gen_cxx_lut
rm -f $@.tmp
$(srcdir)/gen_cxx_lut simple_point3d_lut_26_6 "(26, 6)" <$< >$@.tmp
$(srcdir)/gen_cxx_lut simple_point3d_lut_26_6 "(26, 6)" \
<simple_point3d_lut_26_6.txt >$@.tmp
mv $@.tmp $@
# Very long (both to compile and execute) optional test, checking the
......@@ -73,7 +74,7 @@ simple_point3d_lut_26_6.hh: simple_point3d_lut_26_6.txt $(srcdir)/gen_cxx_lut
.PHONY: check-extra
check-extra: test_simple_point3d_lut_26_6$(EXEEXT)
./$<
./test_simple_point3d_lut_26_6$(EXEEXT)
EXTRA_LTLIBRARIES = libsimple_point3d_lut_26_6.la
libsimple_point3d_lut_26_6_la_SOURCES = simple_point3d_lut_26_6.cc
......
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