10 Apr
2004
10 Apr
'04
7:40 p.m.
Je sais pas ce que j'ai fait, mais on pouvait plus faire de checkout des
versions 10.138 et 10.139. Je suis reparti de la 10.137 et j'ai refait les
modifs.
Index: ChangeLog
from Damien Thivolle <damien(a)lrde.epita.fr>
* cleanup.sh: Replace `-or' by `-o' to improve portability.
* configure.ac: Add `DOC_CPPFLAGS' substitution.
* config/oln.m4: Add `DOC_CPPFLAGS' variable.
Improve portability.
Index: doc/ChangeLog
from Damien Thivolle <damien(a)lrde.epita.fr>
* doc/ref/Makefile.am: Use `clean-local' and `distclean-local' to delete
files.
* doc/ref/out/exdoc.config.in: Add `DOC_CPPFLAGS' to the compilation
flags.
Index: cleanup.sh
--- cleanup.sh Mon, 03 Mar 2003 18:06:54 +0100 burrus_n (oln/o/29_cleanup.sh 1.5 700)
+++ cleanup.sh Fri, 09 Apr 2004 18:30:54 +0200 thivol_d (oln/o/29_cleanup.sh 1.5.1.1 700)
@@ -2,16 +2,16 @@
{
find . -name \*~ \
- -or -name \*\# \
- -or -name .\#\* \
- -or -name \*.log \
- -or -name diffs.patch
+ -o -name \*\# \
+ -o -name .\#\* \
+ -o -name \*.log \
+ -o -name diffs.patch
echo "olena/oln/config/pconf-inc.in"
echo "olena/oln/config/pconf.inc"
echo "olena/oln/config/pconf.hh"
} | xargs rm -f
find . -name autom4te.cache \
- -or -name .libs \
- -or -name .deps \
+ -o -name .libs \
+ -o -name .deps \
| xargs rm -rf
Index: configure.ac
--- configure.ac Mon, 29 Mar 2004 00:39:14 +0200 thivol_d (oln/3_configure.
1.47.1.1.1.1.1.4.1.15.1.16 600)
+++ configure.ac Fri, 09 Apr 2004 18:30:54 +0200 thivol_d (oln/3_configure.
1.47.1.1.1.1.1.4.1.15.1.16.1.1 600)
@@ -436,6 +436,8 @@
])dnl End of OLN_COLLECTION([OLN_TOP])
+AC_SUBST([DOC_CPPFLAGS])
+
AC_OUTPUT
if test "x$oln_cxxflags_clean" = xno; then
Index: doc/ref/Makefile.am
--- doc/ref/Makefile.am Wed, 07 Apr 2004 19:04:46 +0200 thivol_d (oln/d/51_Makefile.a
1.27.1.17 600)
+++ doc/ref/Makefile.am Fri, 09 Apr 2004 18:30:54 +0200 thivol_d (oln/d/51_Makefile.a
1.27.1.17.1.1 600)
@@ -7,14 +7,8 @@
EXDOC = $(srcdir)/exdoc.pl
OUT_DIR = "out"
IMG_CONV = $(srcdir)/img_conv.pl
-CLEANFILES = -r -- html.tar.gz \
- oln-ref.pdf \
- ./$(OUT_DIR)/out* \
- ./html \
- ./latex \
- ./img \
- ./$(OUT_DIR)/makefile \
- ./$(OUT_DIR)/all.mk
+CLEANFILES = html.tar.gz \
+ oln-ref.pdf
doc: html.tar.gz oln-ref.pdf
@@ -36,11 +30,15 @@
dist_noinst_DATA = oln-ref.pdf html.tar.gz $(srcdir)/exdoc.pl $(srcdir)/img_conv.pl
-dist-local:
- rm -rf img/*
+clean-local:
+ rm -rf img out/out* html latex out/makefile out/all.mk
+
+distclean-local:
+ rm -f out/exdoc.config
+
MAINTAINERCLEANFILES = $(dist_noinst_DATA) \
- ./html/* ./img/* ./$(OUT_DIR)/*
+ ./html/* ./img/*
# ###
# ### What gets installed.
Index: config/oln.m4
--- config/oln.m4 Wed, 07 Apr 2004 19:04:46 +0200 thivol_d (oln/j/15_oln.m4 1.38 600)
+++ config/oln.m4 Fri, 09 Apr 2004 18:30:54 +0200 thivol_d (oln/j/15_oln.m4 1.38.1.1 600)
@@ -350,6 +350,7 @@
CPPFLAGS=$oln_save_CPPFLAGS])
if test "x$[]oln_cv_$1_flags" = xredef; then
CPPFLAGS="$CPPFLAGS -DNEED_$2"
+ DOC_CPPFLAGS="$DOC_CPPFLAGS -DNEED_$2"
elif test "x$[]oln_cv_$1_flags" = xisodef; then
CPPFLAGS="$CPPFLAGS -D_ISOC99_SOURCE=1"
fi
@@ -435,7 +436,7 @@
[ac_cv_cxx_style],
[ac_cv_cxx_style=unknown
if test "x$ac_compiler_gnu" != xno; then
- if $CXX --version | grep " 3\.\(3\|4\)" >/dev/null ; then
+ if $CXX --version | grep [' 3\.[234]'] >/dev/null ; then
ac_cv_cxx_style=GNU
else
ac_cv_cxx_style=weakGNU
Index: doc/ref/out/exdoc.config.in
--- doc/ref/out/exdoc.config.in Fri, 09 Apr 2004 10:59:55 +0200 palma_g
(oln/k/7_exdoc.conf 1.5 600)
+++ doc/ref/out/exdoc.config.in Fri, 09 Apr 2004 18:30:54 +0200 thivol_d
(oln/k/7_exdoc.conf 1.5.1.1 600)
@@ -4,7 +4,7 @@
TAG_CLOSE = endcode
CAPTIONS = cxx # We want to run cxx on the extracted files (see line below)
ALIAS cxx = @CXX@ # Here, cxx means g++ but you can choose other compilers
- OPTIONS = @CXXFLAGS_OPTIMIZE@ @CXXFLAGS_STRICT_ERRORS@ -I@top_srcdir@/integre
-I@top_builddir@/olena -I@top_srcdir@/olena -I@top_srcdir@/metalic $1 -o $2
-DIMG_OUT=\"../img/\" -DIMG_IN=\"@top_srcdir@/olena/img/\" # tell how
to use the soft, i.e. where to put input and output arguments (default if not overriden)
($1: input, $2: output) FIXME: $* should have explicit name, chek flags
+ OPTIONS = @DOC_CPPFLAGS@ @CXXFLAGS_OPTIMIZE@ @CXXFLAGS_STRICT_ERRORS@
-I@top_srcdir@/integre -I@top_builddir@/olena -I@top_srcdir@/olena
-I@top_srcdir@/metalic $1 -o $2 -DIMG_OUT=\"../img/\"
-DIMG_IN=\"@top_srcdir@/olena/img/\" # tell how to use the soft, i.e. where to
put input and output arguments (default if not overriden) ($1: input, $2: output) FIXME:
$* should have explicit name, chek flags
OUT = out # FIXME: should be obsolete
EXT = cc # Extension of generated file
STD_OUT_EXT = std # Extension of generated file standard output
--
Damien Thivolle
damien.thivolle(a)lrde.epita.fr