- Olena-patches

*****SPAM***** Superb Chance for Employment for Worldwide Population - Environmental Corporation rooting out and Recruiting Potential Candidates
by olena-patches＠lrde.epita.fr 27 Aug '13

27 Aug '13

1 0

*****SPAM***** Environmental business currently seeking representatives from throughout the world.
by olena-patches＠lrde.epita.fr 26 Aug '13

26 Aug '13

1 0

*****SPAM***** Excellent Opportunity �- Environmental Business Growing and Seeking Representatives
by olena-patches＠lrde.epita.fr 26 Aug '13

26 Aug '13

1 0

olena: branch fft updated: olena-2.0-638-g0a07893
by git＠lrde.epita.fr 26 Aug '13

26 Aug '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch fft has been updated discards 773114f96eeb083d260eed6e5a508d9b93d9c9b2 (commit) via 0a078938b8f3fdc10d234fe663ff74a4b6a44284 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (773114f96eeb083d260eed6e5a508d9b93d9c9b2) \ N -- N -- N (0a078938b8f3fdc10d234fe663ff74a4b6a44284) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 0a07893 Run FFT unit tests only when FFTW3 support is enabled. ----------------------------------------------------------------------- Summary of changes: milena/tests/unit_test/cond_tests_fftw3 | 1 + 1 file changed, 1 insertion(+) create mode 100644 milena/tests/unit_test/cond_tests_fftw3 hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: branch fft updated: olena-2.0-638-g773114f
by git＠lrde.epita.fr 26 Aug '13

26 Aug '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch fft has been updated via 773114f96eeb083d260eed6e5a508d9b93d9c9b2 (commit) from 8b31df65d090f1ac9965f0feb4d3bb68a17948f1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 773114f Run FFT unit tests only when FFTW3 support is enabled. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 8 ++++++++ milena/tests/unit_test/Makefile.am | 3 ++- milena/tests/unit_test/unit-tests.mk | 10 +++++++++- 3 files changed, 19 insertions(+), 2 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-638-g0a07893 Run FFT unit tests only when FFTW3 support is enabled.
by Roland Levillain 26 Aug '13

26 Aug '13

* tests/unit_test/cond_tests_fftw3: New. * tests/unit_test/Makefile.am (COND_TESTS): Add cond_tests_fftw3. * tests/unit_test/unit-tests.mk: Regen. --- milena/ChangeLog | 8 ++++++++ milena/tests/unit_test/Makefile.am | 3 ++- milena/tests/unit_test/cond_tests_fftw3 | 1 + milena/tests/unit_test/unit-tests.mk | 10 +++++++++- 4 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 milena/tests/unit_test/cond_tests_fftw3 diff --git a/milena/ChangeLog b/milena/ChangeLog index 72bfb1a..f7fb36d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,11 @@ +2013-08-26 Roland Levillain <roland(a)lrde.epita.fr> + + Run FFT unit tests only when FFTW3 support is enabled. + + * tests/unit_test/cond_tests_fftw3: New. + * tests/unit_test/Makefile.am (COND_TESTS): Add cond_tests_fftw3. + * tests/unit_test/unit-tests.mk: Regen. + 2012-10-10 Roland Levillain <roland(a)lrde.epita.fr> Split the interface of the FFT off from its implementation. diff --git a/milena/tests/unit_test/Makefile.am b/milena/tests/unit_test/Makefile.am index 37df4c8..1c3016f 100644 --- a/milena/tests/unit_test/Makefile.am +++ b/milena/tests/unit_test/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2008, 2009, 2010 EPITA Research and Development +# Copyright (C) 2008, 2009, 2010, 2013 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -19,6 +19,7 @@ include $(top_srcdir)/milena/tests/tests.mk COND_TESTS = cond_tests_boost-tuple \ cond_tests_cfitsio \ + cond_tests_fftw3 \ cond_tests_gdcm \ cond_tests_magickxx \ cond_tests_poppler \ diff --git a/milena/tests/unit_test/cond_tests_fftw3 b/milena/tests/unit_test/cond_tests_fftw3 new file mode 100644 index 0000000..c09df70 --- /dev/null +++ b/milena/tests/unit_test/cond_tests_fftw3 @@ -0,0 +1 @@ +mln/transform/fft.hh diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index d1c1355..01272a0 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -24,6 +24,15 @@ mln_io_fits_load_LDFLAGS= ${CFITSIO_LDFLAGS} ${AM_LDFLAGS} endif HAVE_CFITSIO # Starting a conditional unit test list. +if HAVE_FFTW3 +check_PROGRAMS += \ +mln_transform_fft + +mln_transform_fft_CPPFLAGS= ${FFTW3_CPPFLAGS} -DHAVE_FFTW3 ${AM_CPPFLAGS} +mln_transform_fft_LDFLAGS= ${FFTW3_LDFLAGS} ${AM_LDFLAGS} +endif HAVE_FFTW3 + +# Starting a conditional unit test list. if HAVE_GDCM check_PROGRAMS += \ mln_io_dicom_all \ @@ -1183,7 +1192,6 @@ mln_transform_distance_and_influence_zone_geodesic \ mln_transform_distance_front \ mln_transform_distance_geodesic \ mln_transform_essential \ -mln_transform_fft \ mln_transform_hough \ mln_transform_influence_zone_front \ mln_transform_influence_zone_geodesic \ -- 1.7.10.4

1 0

olena: olena-2.0-638-g773114f Run FFT unit tests only when FFTW3 support is enabled.
by Roland Levillain 26 Aug '13

26 Aug '13

* tests/unit_test/cond_tests_fftw3: New. * tests/unit_test/Makefile.am (COND_TESTS): Add cond_tests_fftw3. * tests/unit_test/unit-tests.mk: Regen. --- milena/ChangeLog | 8 ++++++++ milena/tests/unit_test/Makefile.am | 3 ++- milena/tests/unit_test/unit-tests.mk | 10 +++++++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 72bfb1a..f7fb36d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,11 @@ +2013-08-26 Roland Levillain <roland(a)lrde.epita.fr> + + Run FFT unit tests only when FFTW3 support is enabled. + + * tests/unit_test/cond_tests_fftw3: New. + * tests/unit_test/Makefile.am (COND_TESTS): Add cond_tests_fftw3. + * tests/unit_test/unit-tests.mk: Regen. + 2012-10-10 Roland Levillain <roland(a)lrde.epita.fr> Split the interface of the FFT off from its implementation. diff --git a/milena/tests/unit_test/Makefile.am b/milena/tests/unit_test/Makefile.am index 37df4c8..1c3016f 100644 --- a/milena/tests/unit_test/Makefile.am +++ b/milena/tests/unit_test/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2008, 2009, 2010 EPITA Research and Development +# Copyright (C) 2008, 2009, 2010, 2013 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -19,6 +19,7 @@ include $(top_srcdir)/milena/tests/tests.mk COND_TESTS = cond_tests_boost-tuple \ cond_tests_cfitsio \ + cond_tests_fftw3 \ cond_tests_gdcm \ cond_tests_magickxx \ cond_tests_poppler \ diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index d1c1355..01272a0 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -24,6 +24,15 @@ mln_io_fits_load_LDFLAGS= ${CFITSIO_LDFLAGS} ${AM_LDFLAGS} endif HAVE_CFITSIO # Starting a conditional unit test list. +if HAVE_FFTW3 +check_PROGRAMS += \ +mln_transform_fft + +mln_transform_fft_CPPFLAGS= ${FFTW3_CPPFLAGS} -DHAVE_FFTW3 ${AM_CPPFLAGS} +mln_transform_fft_LDFLAGS= ${FFTW3_LDFLAGS} ${AM_LDFLAGS} +endif HAVE_FFTW3 + +# Starting a conditional unit test list. if HAVE_GDCM check_PROGRAMS += \ mln_io_dicom_all \ @@ -1183,7 +1192,6 @@ mln_transform_distance_and_influence_zone_geodesic \ mln_transform_distance_front \ mln_transform_distance_geodesic \ mln_transform_essential \ -mln_transform_fft \ mln_transform_hough \ mln_transform_influence_zone_front \ mln_transform_influence_zone_geodesic \ -- 1.7.10.4

1 0

olena: olena-2.0-642-gb1efc3e Remove old Subversion keywords from ChangeLogs.
by Roland Levillain 26 Aug '13

26 Aug '13

--- ChangeLog | 4 ---- milena/ChangeLog | 4 ---- scribo/ChangeLog | 4 ---- swilena/ChangeLog | 4 ---- 4 files changed, 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0447440..4b6e319 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4168,10 +4168,6 @@ * vcs/oln.rb: New. -$Rev$ -$Id$ -$Date$ - Local Variables: ispell-local-dictionary: "american" coding: iso-latin-1 diff --git a/milena/ChangeLog b/milena/ChangeLog index 386b20e..df99b3e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -59261,10 +59261,6 @@ * vcs/milena.rb: New file. -$Rev$ -$Id$ -$Date$ - Local Variables: ispell-local-dictionary: "american" coding: iso-latin-1 diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 1f87892..b5efaa7 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -9549,10 +9549,6 @@ * tests/unit_test/build_unit_test.sh: new. -$Rev$ -$Id$ -$Date$ - Local Variables: ispell-local-dictionary: "american" coding: iso-latin-1 diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 28d78ca..292b4c7 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -903,10 +903,6 @@ * python/Makefile.am: New. -$Rev$ -$Id$ -$Date$ - Local Variables: ispell-local-dictionary: "american" coding: iso-latin-1 -- 1.7.10.4

1 0

olena: olena-2.0-641-gf15b2c0 Improve the generation of Doxyfiles in Olena.
by Roland Levillain 26 Aug '13

26 Aug '13

* doc/Makefile.am (edit) ($(srcdir)/user-refman.stamp): Use `[@]' instead of `\@' for portability reasons. (ID): New (empty). ($(DOXYFILE_USER)): Do not depend on $Id$ from ChangeLog. * doc/Doxyfile.in (PROJECT_NUMBER): Reintegrate @ID@ to the project number, even if it is not yet set. Improve the generation of Doxyfiles in Olena. --- ChangeLog | 13 +++++++++++++ doc/Doxyfile.in | 4 ++-- doc/Makefile.am | 39 ++++++++++++++++++++------------------- 3 files changed, 35 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index dd4134d..0447440 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2013-08-26 Roland Levillain <roland(a)lrde.epita.fr> + + Improve the generation of Doxyfiles in Olena. + + * doc/Makefile.am (edit) + ($(srcdir)/user-refman.stamp): + Use `[@]' instead of `\@' for portability reasons. + (ID): New (empty). + ($(DOXYFILE_USER)): Do not depend on $Id$ from ChangeLog. + * doc/Doxyfile.in (PROJECT_NUMBER): Reintegrate @ID@ to the + project number, even if it is not yet set. + Improve the generation of Doxyfiles in Olena. + 2012-10-09 Roland Levillain <roland(a)lrde.epita.fr> Ask configure to try to find FFTW (version 3). diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 6cb8bfb..526a24e 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2011, 2012 EPITA Research and Development Laboratory +# Copyright (C) 2011, 2012, 2013 EPITA Research and Development Laboratory # (LRDE) # # This file is part of Olena. @@ -21,7 +21,7 @@ # Project related configuration options #--------------------------------------------------------------------------- PROJECT_NAME = "Olena" -PROJECT_NUMBER = "User documentation @PACKAGE_VERSION@" +PROJECT_NUMBER = "User documentation @PACKAGE_VERSION@ @ID@" PROJECT_BRIEF = "An Image Processing Platform" PROJECT_LOGO = @top_srcdir@/doc/images/logo.jpg OUTPUT_DIRECTORY = @builddir@/user-refman.tmp diff --git a/doc/Makefile.am b/doc/Makefile.am index 2ecb26d..878f7ce 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -86,25 +86,26 @@ REFMAN_deps = $(srcdir)/footer.html \ EXTRA_DIST += $(REFMAN_deps) -# Sed is used to generate Doxyfile from Doxyfile.in instead of -# configure, because the former is way faster than the latter. -# -## FIXME: This is because, as in TC, we depend on $Id$ from the -## ChangeLog. Maybe we should depend from something less prone to -## change. See Bison's build system. -edit = sed -e "s|@ID@|$$Id|" \ - -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \ - -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \ - -e 's,@top_srcdir\@,$(top_srcdir),g' \ - -e 's,@abs_top_srcdir\@,$(abs_top_srcdir),g' \ - -e 's,@top_builddir\@,$(top_builddir),g' \ - -e 's,@srcdir\@,$(srcdir),g' \ - -e 's,@builddir\@,$(builddir),g' +## FIXME: We used to depend on Subversion's $Id$ (extracted from +## ChangeLog) before. We should depend on something less prone to +## change from now on. The best is probably to use `git-version-gen' +## from Gnulib (as Bison does). For the moment, set ID to an empty +## string. +ID = +# Use Make to generate Doxyfile instead of `configure', as advised by +# Autoconf's manual (see section ``Installation Directory +# Variables''). +edit = sed -e "s|@ID[@]|$(ID)|" \ + -e 's,@PACKAGE_NAME[@],$(PACKAGE_NAME),g' \ + -e 's,@PACKAGE_VERSION[@],$(PACKAGE_VERSION),g' \ + -e 's,@top_srcdir[@],$(top_srcdir),g' \ + -e 's,@abs_top_srcdir[@],$(abs_top_srcdir),g' \ + -e 's,@top_builddir[@],$(top_builddir),g' \ + -e 's,@srcdir[@],$(srcdir),g' \ + -e 's,@builddir[@],$(builddir),g' $(DOXYFILE_USER): $(srcdir)/$(DOXYFILE).in - Id=`grep '^\$$Id' $(top_srcdir)/milena/ChangeLog \ - | sed -e 's/\\\$$//g'`; \ - $(edit) $< >$@ + $(edit) $< >$@ MAINTAINERCLEANFILES = $(DOXYFILE_USER) USER_REFMAN = user-refman @@ -122,8 +123,8 @@ $(srcdir)/user-refman.stamp: $(srcdir)/$(DOXYFILE).in $(REFMAN_deps) rm -rf $(srcdir)/$(USER_REFMAN) ## Fix path to the main page of the documentation. find $(USER_REFMAN).tmp/html -name '*.html' -exec \ - perl -pi -e "s,\@relcommondocpath\@,../../,g;" \ - -e "s,\@userrefman\@,$(USER_REFMAN),g" \ + perl -pi -e "s,@relcommondocpath[@],../../,g;" \ + -e "s,@userrefman[@],$(USER_REFMAN),g" \ {} \; ## FIXME: Moving directories between file systems is not portable. mv $(USER_REFMAN).tmp $(srcdir)/$(USER_REFMAN) -- 1.7.10.4

1 0

olena: olena-2.0-640-g8f094c6 Improve the generation of Doxyfiles in Scribo.
by Roland Levillain 26 Aug '13

26 Aug '13

* doc/Makefile.am (edit) ($(srcdir)/user-refman.stamp) ($(srcdir)/devel-refman.stamp): Use `[@]' instead of `\@' for portability reasons. (ID): New (empty). (edit_devel): Prevent configure from expanding @builddir@. Christen the product as ``Developer documentation''. ($(DOXYFILE_USER), $(DOXYFILE_DEVEL)): Do not depend on $Id$ from ChangeLog. * doc/Doxyfile.in (PROJECT_NUMBER): Reintegrate @ID@ to the project number, even if it is not yet set. --- scribo/ChangeLog | 16 ++++++++++++++++ scribo/doc/Doxyfile.in | 2 +- scribo/doc/Makefile.am | 50 ++++++++++++++++++++++++------------------------ 3 files changed, 42 insertions(+), 26 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 88f7ca5..1f87892 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,19 @@ +2013-08-26 Roland Levillain <roland(a)lrde.epita.fr> + + Improve the generation of Doxyfiles in Scribo. + + * doc/Makefile.am (edit) + ($(srcdir)/user-refman.stamp) + ($(srcdir)/devel-refman.stamp): + Use `[@]' instead of `\@' for portability reasons. + (ID): New (empty). + (edit_devel): Prevent configure from expanding @builddir@. + Christen the product as ``Developer documentation''. + ($(DOXYFILE_USER), $(DOXYFILE_DEVEL)): Do not depend on $Id$ from + ChangeLog. + * doc/Doxyfile.in (PROJECT_NUMBER): Reintegrate @ID@ to the + project number, even if it is not yet set. + 2013-08-22 Roland Levillain <roland(a)lrde.epita.fr> Slightly improve Scribo's tests/primitive/extract/alignments.cc. diff --git a/scribo/doc/Doxyfile.in b/scribo/doc/Doxyfile.in index 904121c..d37780e 100644 --- a/scribo/doc/Doxyfile.in +++ b/scribo/doc/Doxyfile.in @@ -21,7 +21,7 @@ # Project related configuration options #--------------------------------------------------------------------------- PROJECT_NAME = "Scribo" -PROJECT_NUMBER = "User documentation @PACKAGE_VERSION@" +PROJECT_NUMBER = "User documentation @PACKAGE_VERSION@ @ID@" PROJECT_BRIEF = "An Image Processing Platform" PROJECT_LOGO = @top_srcdir@/doc/images/logo.jpg OUTPUT_DIRECTORY = @builddir@/user-refman.tmp diff --git a/scribo/doc/Makefile.am b/scribo/doc/Makefile.am index c459d84..5264ddf 100644 --- a/scribo/doc/Makefile.am +++ b/scribo/doc/Makefile.am @@ -54,25 +54,26 @@ regen-doc: DOXYFILE_USER = Doxyfile_user -# Sed is used to generate Doxyfile from Doxyfile.in instead of -# configure, because the former is way faster than the latter. -# -## FIXME: This is because, as in TC, we depend on $Id$ from the -## ChangeLog. Maybe we should depend from something less prone to -## change. See Bison's build system. -edit = sed -e "s|@ID@|$$Id|" \ - -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \ - -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \ - -e 's,@top_srcdir\@,$(top_srcdir),g' \ - -e 's,@abs_top_srcdir\@,$(abs_top_srcdir),g' \ - -e 's,@top_builddir\@,$(top_builddir),g' \ - -e 's,@srcdir\@,$(srcdir),g' \ - -e 's,@builddir\@,$(builddir),g' +## FIXME: We used to depend on Subversion's $Id$ (extracted from +## ChangeLog) before. We should depend on something less prone to +## change from now on. The best is probably to use `git-version-gen' +## from Gnulib (as Bison does). For the moment, set ID to an empty +## string. +ID = +# Use Make to generate Doxyfile instead of `configure', as advised by +# Autoconf's manual (see section ``Installation Directory +# Variables''). +edit = sed -e "s|@ID[@]|$(ID)|" \ + -e 's,@PACKAGE_NAME[@],$(PACKAGE_NAME),g' \ + -e 's,@PACKAGE_VERSION[@],$(PACKAGE_VERSION),g' \ + -e 's,@top_srcdir[@],$(top_srcdir),g' \ + -e 's,@abs_top_srcdir[@],$(abs_top_srcdir),g' \ + -e 's,@top_builddir[@],$(top_builddir),g' \ + -e 's,@srcdir[@],$(srcdir),g' \ + -e 's,@builddir[@],$(builddir),g' $(DOXYFILE_USER): $(srcdir)/$(DOXYFILE).in - Id=`grep '^\$$Id' $(top_srcdir)/scribo/ChangeLog \ - | sed -e 's/\\\$$//g'`; \ - $(edit) $< >$@ + $(edit) $< >$@ MAINTAINERCLEANFILES = $(DOXYFILE_USER) USER_REFMAN = user-refman @@ -100,8 +101,8 @@ $(srcdir)/user-refman.stamp: $(srcdir)/$(DOXYFILE).in $(REFMAN_deps) rm -rf $(srcdir)/$(USER_REFMAN) ## Fix path to the main page of the documentation. find $(USER_REFMAN).tmp -name '*.html' -exec \ - perl -pi -e "s,\@relcommondocpath\@,../../../../doc/,g;" \ - -e "s,\@userrefman\@,$(USER_REFMAN),g" \ + perl -pi -e "s,@relcommondocpath[@],../../../../doc/,g;" \ + -e "s,@userrefman[@],$(USER_REFMAN),g" \ {} \; ## FIXME: Moving directories between file systems is not portable. mv $(USER_REFMAN).tmp $(srcdir)/$(USER_REFMAN) @@ -136,7 +137,7 @@ regen-devel-doc: DOXYFILE_DEVEL = Doxyfile_devel edit_devel = sed \ - -e 's,OUTPUT_DIRECTORY = @builddir@/user-refman.tmp,OUTPUT_DIRECTORY = @builddir@/devel-refman.tmp,' \ + -e 's,OUTPUT_DIRECTORY = $.*$/user-refman.tmp,OUTPUT_DIRECTORY = \1/devel-refman.tmp,' \ -e 's,EXTRACT_ALL = NO,EXTRACT_ALL = YES,' \ -e 's,EXTRACT_PRIVATE = NO,EXTRACT_PRIVATE = YES,' \ -e 's,EXTRACT_STATIC = NO,EXTRACT_STATIC = YES,' \ @@ -148,13 +149,12 @@ edit_devel = sed \ -e 's,INTERNAL_DOCS = NO,INTERNAL_DOCS = YES,' \ -e 's,GENERATE_TODOLIST = NO,GENERATE_TODOLIST = YES,' \ -e 's,PROJECT_NUMBER = \"User documentation ,PROJECT_NUMBER = \",' \ + -e 's,PROJECT_NUMBER = \"User documentation ,PROJECT_NUMBER = \"Developer documentation ,' \ -e 's,EXCLUDE_SYMBOLS = \*::internal\* \*_ mln::trait::\*,EXCLUDE_SYMBOLS =,' $(DOXYFILE_DEVEL): $(srcdir)/$(DOXYFILE).in rm -f $@.tmp - Id=`grep '^\$$Id' $(top_srcdir)/scribo/ChangeLog \ - | sed -e 's/\\\$$//g'`; \ - $(edit) $< >$@.tmp + $(edit) $< >$@.tmp $(edit_devel) $@.tmp >$@ rm -f $@.tmp MAINTAINERCLEANFILES += $(DOXYFILE_DEVEL) @@ -183,8 +183,8 @@ $(srcdir)/devel-refman.stamp: $(srcdir)/$(DOXYFILE).in $(REFMAN_deps) test -f $(DEVEL_REFMAN).tmp/latex/refman.tex rm -rf $(srcdir)/$(DEVEL_REFMAN) ## Fix path to the main page of the documentation. - perl -pi -e "s,\@relcommondocpath\@,../../../../doc/,g;" \ - -e "s,\@userrefman\@,$(DEVEL_REFMAN),g" \ + perl -pi -e "s,@relcommondocpath[@],../../../../doc/,g;" \ + -e "s,@userrefman[@],$(DEVEL_REFMAN),g" \ $(DEVEL_REFMAN).tmp/html/index.html ## FIXME: Moving directories between file systems is not portable. mv $(DEVEL_REFMAN).tmp $(srcdir)/$(DEVEL_REFMAN) -- 1.7.10.4

1 0