[Olena-patches] 3071: Enable the generation of version.hh.

* configure.ac: set the proper variables. * Makefile.am: add doc target. --- ChangeLog | 8 ++++++++ Makefile.am | 4 ++++ configure.ac | 13 ++++++++++++- 3 files changed, 24 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8613740..25aeb2a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-12-19 Guillaume Lazzara <z(a)lrde.epita.fr> + + Enable the generation of version.hh. + + * configure.ac: set the proper variables. + + * Makefile.am: add doc target. + 2008-12-18 Guillaume Lazzara <z(a)lrde.epita.fr> Add missing INSTALL and README. diff --git a/Makefile.am b/Makefile.am index 161918a..175def0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,6 +4,10 @@ ACLOCAL_AMFLAGS = -I build-aux SUBDIRS = build-aux external milena +.PHONY: doc +doc: + $(MAKE) -C milena doc + if ENABLE_SWILENA SUBDIRS += swilena endif ENABLE_SWILENA diff --git a/configure.ac b/configure.ac index ee54879..1d5ca57 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,18 @@ AC_CONFIG_FILES([build-aux/Makefile]) # Automake. AM_INIT_AUTOMAKE([1.10 foreign check-news dist-bzip2 nostdinc -Wall]) -AC_CONFIG_HEADERS([config.h] [milena/mln/version.hh]) +AC_CONFIG_HEADERS([config.h:config.hin] [milena/mln/version.hh]) + +# Misc. variables. +AC_DEFINE_UNQUOTED([MLN_PACKAGE_NAME], ["$PACKAGE_NAME"], + [Package Full name.]) +AC_DEFINE_UNQUOTED([MLN_PACKAGE_BUGREPORT], ["$PACKAGE_BUGREPORT"], + [Bug report address.]) +AC_DEFINE_UNQUOTED([MLN_PACKAGE_STRING], ["$PACKAGE_STRING"], + [Full name and version.]) +AC_DEFINE_UNQUOTED([MLN_PACKAGE_VERSION], ["$PACKAGE_VERSION"], + [Package Version.]) + ## --------------------- ## ## C++ compiler set up. ## -- 1.5.6.5