Commit 83c98751 authored by Roland Levillain's avatar Roland Levillain
Browse files

Milena: Factor Makefiles a bit more using file inclusion.

	* tests/tests.mk (AM_CPPFLAGS): Move general flags...
	* common.mk (AM_CPPFLAGS): ...here.
	Include it...
	* doc/Makefile.am: ...here, to factor common parts.
	* milena/apps/apps.mk: New file.
	Include it...
	* apps/constrained-connectivity/Makefile.am,
	* apps/generic-skel/Makefile.am,
	* apps/graph-morpho/Makefile.am,
	* apps/morphers/Makefile.am,
	* apps/papers/levillain.09.ismm/Makefile.am:
	...here, to factor common parts.
	* apps/mesh-segm-skel/Makefile.am: Likewise.
	(noinst_HEADERS): Add save_bin_alt.hh.
	(mesh_complex_skel_SOURCES)
	(mesh_complex_max_curv_skel_SOURCES)
	(mesh_complex_pinv_curv_skel_SOURCES):
	Remove.
	* tools/tools.mk: Remove this file and move its contents...
	* tools/Makefile.am: ...here.
parent 62d3b9d1
2013-09-13 Roland Levillain <roland@lrde.epita.fr>
Milena: Factor Makefiles a bit more using file inclusion.
* tests/tests.mk (AM_CPPFLAGS): Move general flags...
* common.mk (AM_CPPFLAGS): ...here.
Include it...
* doc/Makefile.am: ...here, to factor common parts.
* milena/apps/apps.mk: New file.
Include it...
* apps/constrained-connectivity/Makefile.am,
* apps/generic-skel/Makefile.am,
* apps/graph-morpho/Makefile.am,
* apps/morphers/Makefile.am,
* apps/papers/levillain.09.ismm/Makefile.am:
...here, to factor common parts.
* apps/mesh-segm-skel/Makefile.am: Likewise.
(noinst_HEADERS): Add save_bin_alt.hh.
(mesh_complex_skel_SOURCES)
(mesh_complex_max_curv_skel_SOURCES)
(mesh_complex_pinv_curv_skel_SOURCES):
Remove.
* tools/tools.mk: Remove this file and move its contents...
* tools/Makefile.am: ...here.
2013-09-12 Roland Levillain <roland@lrde.epita.fr>
 
Milena: Remove `return 0;' statements at end of main().
## apps.mk -*- Makefile-Automake -*-
## Shared configuration for apps.
## Copyright (C) 2013 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/>.
include $(top_srcdir)/milena/common.mk
# Find apps/data.hh (generated header).
AM_CPPFLAGS += -I$(top_builddir)/milena
# Produce fast code.
AM_CXXFLAGS = $(APPS_CXXFLAGS)
# Inject rules to compile tests (recursively), without running them.
include $(top_srcdir)/build-aux/tests-recursive.mk
......@@ -15,14 +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)/milena/common.mk
# Find Milena headers.
AM_CPPFLAGS = -I$(top_srcdir)/milena
# Find apps/data.hh (generated header).
AM_CPPFLAGS += -I$(top_builddir)/milena
# Produce fast code.
AM_CXXFLAGS = $(APPS_CXXFLAGS)
include $(top_srcdir)/milena/apps/apps.mk
noinst_PROGRAMS = constrained-connectivity
constrained_connectivity_CXXFLAGS = $(AM_CXXFLAGS) $(STRICT_ALIASING_CXXFLAGS)
......
......@@ -14,14 +14,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)/milena/common.mk
# Find Milena headers.
AM_CPPFLAGS = -I$(top_srcdir)/milena
# Find apps/data.hh (generated header).
AM_CPPFLAGS += -I$(top_builddir)/milena
# Produce fast code.
AM_CXXFLAGS = $(APPS_CXXFLAGS)
include $(top_srcdir)/milena/apps/apps.mk
generated_checked_tests =
generated_tests = $(generated_checked_tests)
......
......@@ -15,14 +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)/milena/common.mk
# Find Milena headers.
AM_CPPFLAGS = -I$(top_srcdir)/milena
# Find apps/data.hh (generated header).
AM_CPPFLAGS += -I$(top_builddir)/milena
# Produce fast code.
AM_CXXFLAGS = $(APPS_CXXFLAGS)
include $(top_srcdir)/milena/apps/apps.mk
noinst_HEADERS = convert.hh debug.hh make.hh morpho.hh make_complex2d.hh
......
......@@ -15,14 +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)/milena/common.mk
# Find Milena headers.
AM_CPPFLAGS = -I$(top_srcdir)/milena
# Find apps/data.hh (generated header).
AM_CPPFLAGS += -I$(top_builddir)/milena
# Produce fast code.
AM_CXXFLAGS = $(APPS_CXXFLAGS)
include $(top_srcdir)/milena/apps/apps.mk
noinst_PROGRAMS =
generated_checked_tests =
......@@ -170,9 +163,10 @@ MOSTLYCLEANFILES += \
## More complex skeletonization chains.
## ------------------------------------
noinst_HEADERS += save_bin_alt.hh
# Skeletonization program working on precomputed meshes with curvatures data.
noinst_PROGRAMS += mesh-complex-skel
mesh_complex_skel_SOURCES = mesh-complex-skel.cc save_bin_alt.hh
TESTS += test-mesh-complex-skel
MOSTLYCLEANFILES += \
socket-max-curv-skel.off \
......@@ -181,8 +175,6 @@ MOSTLYCLEANFILES += \
bunny-holefilled-pinv-curv-skel.off
noinst_PROGRAMS += mesh-complex-max-curv-skel
mesh_complex_max_curv_skel_SOURCES = \
mesh-complex-max-curv-skel.cc save_bin_alt.hh
TESTS += test-mesh-complex-max-curv-skel
MOSTLYCLEANFILES += \
socket-complex-max-curv-skel.off \
......@@ -190,8 +182,6 @@ MOSTLYCLEANFILES += \
bunny-holefilled-complex-max-curv-skel.off
noinst_PROGRAMS += mesh-complex-pinv-curv-skel
mesh_complex_pinv_curv_skel_SOURCES = \
mesh-complex-pinv-curv-skel.cc save_bin_alt.hh
TESTS += test-mesh-complex-pinv-curv-skel
MOSTLYCLEANFILES += \
socket-complex-pinv-curv-skel.off \
......
......@@ -17,14 +17,7 @@
# Illustrations of morphers.
include $(top_srcdir)/milena/common.mk
# Find Milena headers.
AM_CPPFLAGS = -I$(top_srcdir)/milena
# Find apps/data.hh (generated header).
AM_CPPFLAGS += -I$(top_builddir)/milena
# Produce fast code.
AM_CXXFLAGS = $(APPS_CXXFLAGS)
include $(top_srcdir)/milena/apps/apps.mk
noinst_PROGRAMS = \
mask+channel \
......
......@@ -17,14 +17,7 @@
# Illustrations from the ISMM 2009 paper and presentation (slides).
include $(top_srcdir)/milena/common.mk
# Find Milena headers.
AM_CPPFLAGS = -I$(top_srcdir)/milena
# Find apps/data.hh (generated header).
AM_CPPFLAGS += -I$(top_builddir)/milena
# Produce fast code.
AM_CXXFLAGS = $(APPS_CXXFLAGS)
include $(top_srcdir)/milena/apps/apps.mk
noinst_HEADERS = chain.hh io.hh influence_zones.hh
......
......@@ -2,7 +2,7 @@
## Common Automake parameters.
## Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE).
## Copyright (C) 2010, 2013 EPITA Research and Development Laboratory (LRDE).
##
## This file is part of Olena.
##
......@@ -20,3 +20,6 @@
# C++ sources.
AM_DEFAULT_SOURCE_EXT = .cc
# Find Milena headers.
AM_CPPFLAGS = -I$(top_srcdir)/milena
......@@ -15,9 +15,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/common.mk
# Find Milena headers.
AM_CPPFLAGS = -I$(top_srcdir)/milena
# Find tests/data.hh and doc/tools/data.hh (generated headers).
AM_CPPFLAGS += -I$(top_builddir)/milena
......
......@@ -21,8 +21,6 @@
include $(top_srcdir)/milena/common.mk
# Find Milena headers.
AM_CPPFLAGS = -I$(top_srcdir)/milena
# Find test/data.hh (generated header).
AM_CPPFLAGS += -I$(top_builddir)/milena
......
......@@ -15,7 +15,10 @@
# 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/tools/tools.mk
include $(top_srcdir)/milena/common.mk
# Produce fast code.
AM_CXXFLAGS = $(TOOLS_CXXFLAGS)
# FIXME: Add some tests for these tools.
bin_PROGRAMS = \
......
# Copyright (C) 2009, 2010, 2011, 2013 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/>.
include $(top_srcdir)/milena/common.mk
# Find Milena headers.
AM_CPPFLAGS = -I$(top_srcdir)/milena
AM_CXXFLAGS = $(TOOLS_CXXFLAGS)
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