diff --git a/trunk/paradiseo-mo/Makefile.am b/trunk/paradiseo-mo/Makefile.am index f691c2558..1d666263d 100755 --- a/trunk/paradiseo-mo/Makefile.am +++ b/trunk/paradiseo-mo/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = docs src tutorial +SUBDIRS = doc src tutorial CXX=g++ @@ -22,7 +22,9 @@ clean_aux: -@find . \( -name "*~" -o -name "*.old" -o -name "#*" -o -name "*.bak" \) -print -exec rm -rf \{\} \; doc: - -@(cd docs; make doc) + -@(cd doc; make doc) clean_doc: - -@(cd docs; make clean-local) + -@(cd doc; make clean-local) + +.PHONY: clean_all clean_aux doc clean_doc diff --git a/trunk/paradiseo-mo/cleaner b/trunk/paradiseo-mo/cleaner index 1e5c8c5ba..241f2ca92 100755 --- a/trunk/paradiseo-mo/cleaner +++ b/trunk/paradiseo-mo/cleaner @@ -1,7 +1,8 @@ (rm -rf acconfig.h acinclude.m4 aclocal.m4 autom4te.cache copying install news readme stamp* texput.log authors todo;\ rm -f configure config.* CO* dep* INST* install-sh miss* mkins* Makefile Makefile.in;\ -cd docs; rm -rf Makefile Makefile.in; cd ../src ; rm -rf Makefile Makefile.in; cd ../tutorial; rm -rf Makefile Makefile.in;\ +cd doc; rm -rf Makefile Makefile.in; cd ../src ; rm -rf Makefile Makefile.in; cd ../tutorial; rm -rf Makefile Makefile.in;\ cd examples; rm -f Makefile Makefile.in; cd tsp ; rm -f Makefile Makefile.in; cd src ; rm -rf .deps/ Makefile Makefile.in;\ -cd ../../../Lesson1 ; rm -rf .deps/ Makefile Makefile.in; cd ../Lesson2 ; rm -rf .deps/ Makefile Makefile.in ; cd ../Lesson3 ;\ -rm -rf .deps/ Makefile Makefile.in) +cd ../../../Lesson1 ; rm -rf .deps/ Makefile Makefile.in; cd src; rm -rf .deps/ Makefile Makefile.in; cd ../../Lesson2 ;\ + rm -rf .deps/ Makefile Makefile.in ; cd src; rm -rf .deps/ Makefile Makefile.in; cd ../../Lesson3 ;\ +rm -rf .deps/ Makefile Makefile.in; cd src; rm -rf .deps/ Makefile Makefile.in) find . \( -name "*~" -o -name "*.old" -o -name "#*" -o -name "*.bak" -o -name "*.o" \) -print -exec rm -rf \{\} \; diff --git a/trunk/paradiseo-mo/configure.in b/trunk/paradiseo-mo/configure.in index 7f365a782..ac104d6bf 100755 --- a/trunk/paradiseo-mo/configure.in +++ b/trunk/paradiseo-mo/configure.in @@ -42,14 +42,17 @@ AC_ARG_WITH(EOdir, AC_OUTPUT([ Makefile src/Makefile -docs/Makefile +doc/Makefile tutorial/Makefile tutorial/examples/Makefile tutorial/examples/tsp/Makefile tutorial/examples/tsp/src/Makefile tutorial/Lesson1/Makefile +tutorial/Lesson1/src/Makefile tutorial/Lesson2/Makefile +tutorial/Lesson2/src/Makefile tutorial/Lesson3/Makefile +tutorial/Lesson3/src/Makefile ]) echo "Type 'make doc' for building documentation" diff --git a/trunk/paradiseo-mo/doc/html/annotated.html b/trunk/paradiseo-mo/doc/html/annotated.html index 2f2d6a87a..eda66607a 100644 --- a/trunk/paradiseo-mo/doc/html/annotated.html +++ b/trunk/paradiseo-mo/doc/html/annotated.html @@ -63,7 +63,7 @@
1.5.2