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

Make Milena applications (milena/apps/) optional.

	* configure.ac: Add option `--enable-apps'.
	(ENABLE_APPS): New conditional.
	Always configure milena/apps/Makefile and
	milena/apps/statues/Makefile.
	Populate APPS_CXXFLAGS with default flags.
	* milena/Makefile.am (SUBDIRS) [ENABLE_APPS]: Add apps.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@3813 4aad255d-cdde-0310-9447-f3009e2ae8c0
parent 93c05540
2009-05-11 Roland Levillain <roland@lrde.epita.fr>
Make Milena applications (milena/apps/) optional.
* configure.ac: Add option `--enable-apps'.
(ENABLE_APPS): New conditional.
Always configure milena/apps/Makefile and
milena/apps/statues/Makefile.
Populate APPS_CXXFLAGS with default flags.
* milena/Makefile.am (SUBDIRS) [ENABLE_APPS]: Add apps.
2009-05-11 Roland Levillain <roland@lrde.epita.fr>
Improve configure.ac w.r.t. Trimesh.
......
......@@ -298,14 +298,16 @@ AC_CONFIG_FILES([
## Applications. ##
## -------------- ##
# FIXME: Don't build applications depending on Trimesh if Trimesh is not built.
AC_ARG_ENABLE([apps],
[AS_HELP_STRING([--enable-apps],
[enable application])])
AM_CONDITIONAL([ENABLE_APPS], [test "x$enable_apps" = "xyes"])
# Ask for the creation of applications' Makefiles.
# FIXME: Should it be achieved through oln.m4 macros, as we did in Olena 0.11?
# FIXME: ENABLE IT
#AC_CONFIG_FILES([
# milena/apps/Makefile
# milena/apps/statues/Makefile
#])
AC_CONFIG_FILES([
milena/apps/Makefile
milena/apps/statues/Makefile
])
# Configure tests.
# FIXME: Consider using `sed' instead of `configure' to create these
......@@ -324,4 +326,11 @@ AC_CONFIG_FILES([milena/apps/statues/test-mesh-complex-max-curv-segm],
AC_CONFIG_FILES([milena/apps/statues/test-mesh-complex-skel],
[chmod +x milena/apps/statues/test-mesh-complex-skel])
# Flags for apps.
AC_ARG_VAR([APPS_CXXFLAGS])
# We want fast binaries for apps.
if test "$GXX" = yes && test -z "$APPS_CXXFLAGS"; then
APPS_CXXFLAGS="-O3 -DNDEBUG -ggdb -Wall -W"
fi
AC_OUTPUT
## Process this file through Automake to create Makefile.in.
##FIXME
SUBDIRS = \
doc \
mesh \
tests
# apps
if ENABLE_APPS
SUBDIRS += apps
endif ENABLE_APPS
.PHONY: doc tutorial tools
......
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