Index: ChangeLog from Damien Thivolle <damien@lrde.epita.fr> * cleanup.sh: Replace `-or' by `-o' which is more portable. * config/oln.m4: Improve quoting. Index: doc/ChangeLog from Damien Thivolle <damien@lrde.epita.fr> * doc/ref/Makefile.am: Fix files cleaning. Add MY_CPPFLAGS=... when running make on out/makefile. * doc/ref/exdoc.pl: Add a third argument to the generated scripts. * doc/ref/out/exdoc.config.in: Add `CPPFLAGS' to the compilation line. 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 Thu, 08 Apr 2004 20:41:06 +0200 thivol_d (oln/o/29_cleanup.sh 1.6 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: 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 12:57:25 +0200 thivol_d (oln/d/51_Makefile.a 1.27.1.18 600) @@ -7,22 +7,15 @@ 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 doxy: $(EXDOC) --config=$(OUT_DIR)/exdoc.config --output-dir=$(OUT_DIR) --input-dir=$(top_srcdir) mkdir -p img - cd $(OUT_DIR) && $(MAKE) -f makefile + cd $(OUT_DIR) && $(MAKE) -f makefile MY_CPPFLAGS="$(CPPFLAGS)" $(IMG_CONV) $(top_srcdir)/olena/img img preserve $(IMG_CONV) img img nopreserve $(DOXYGEN) doxygen.config @@ -36,11 +29,11 @@ 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 img latex out/makefile out/all.mk 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 Thu, 08 Apr 2004 16:13:22 +0200 thivol_d (oln/j/15_oln.m4 1.39 600) @@ -435,7 +435,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\.[34]'] >/dev/null ; then ac_cv_cxx_style=GNU else ac_cv_cxx_style=weakGNU Index: doc/ref/exdoc.pl --- doc/ref/exdoc.pl Sun, 14 Mar 2004 18:21:09 +0100 palma_g (oln/v/26_exdoc.pl 1.4 700) +++ doc/ref/exdoc.pl Fri, 09 Apr 2004 12:39:31 +0200 thivol_d (oln/v/26_exdoc.pl 1.5 700) @@ -254,7 +254,7 @@ print $makefile "chmod 700 ./\$<.cmd "; print $makefile "&& eval ./\$@."; print $makefile $config[$i]{"ext"}; - print $makefile ".cmd \$< \$@"; + print $makefile ".cmd \$< \$@ \"\$(MY_CPPFLAGS)\""; print $makefile "\n\n"; } 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 12:52:26 +0200 thivol_d (oln/k/7_exdoc.conf 1.6 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 = $3 @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@lrde.epita.fr