I admit this is a hack, but from Akim's words himself, Autoconf is not
designed to handle optionally configured files, nor is Automake designed
to support optionally distributed files.
Note: olena/oln/lrde is only removed from the distributed files, not
from the repository.
2007-02-08 Roland Levillain <roland(a)lrde.epita.fr>
Remove olena/oln/lrde from the distribution.
* config/strip-lrde: New.
* Makefile.am (EXTRA_DIST): Add config/strip-lrde.
(dist-hook): New.
* configure.ac, Makefile.am, olena/oln/Makefile.am: Use
config/strip-lrde to strip everything related to olena/oln/lrde
when creating the distribution.
2006-12-20 Roland Levillain <roland(a)lrde.epita.fr>
--- 10.271/configure.ac Thu, 08 Feb 2007 12:40:28 +0100 levill_r (oln/3_configure.
1.47.1.1.1.1.1.4.1.15.1.16.1.12 600)
+++ 10.272/configure.ac Thu, 08 Feb 2007 18:09:47 +0100 levill_r (oln/3_configure.
1.47.1.1.1.1.1.4.1.15.1.16.1.13 600)
@@ -463,16 +463,17 @@
AC_SUBST([DOC_CPPFLAGS])
AC_SUBST([TOOLS_LDFLAGS])
-## -- FIXME: Improve integration. ----------------------------------------
-##
-## The contents of `olena/oln/lrde' should be moved to another subdirectory
-## of `olena/oln/', and the contents of `olena/lrde/ufmt/bin to
-## `olena/tests' or to `tools'.
+#<<lrde
+# FIXME: Improve integration.
+#
+# The directory `olena/oln/lrde' is a place where we work on algorithms
+# not mature enough to integrate the distribution. Hence it is only
+# available from the repository, not from the distribution.
AC_CONFIG_FILES([olena/oln/lrde/Makefile
olena/oln/lrde/efigi/Makefile
olena/oln/lrde/ufmt/Makefile
olena/oln/lrde/ufmt/bin/Makefile])
-## ---------------------------------------- FIXME: Improve integration. --
+#>>
AC_OUTPUT
--- 10.271/Makefile.am Fri, 07 Jul 2006 18:40:24 +0200 levill_r (oln/n/32_Makefile.a
1.17.1.2.1.8 600)
+++ 10.272/Makefile.am Thu, 08 Feb 2007 18:09:47 +0100 levill_r (oln/n/32_Makefile.a
1.17.1.2.1.9 600)
@@ -19,7 +19,8 @@
### Development files.
###
-EXTRA_DIST = bootstrap.sh config/oln-local.m4 contrib/runtests
+EXTRA_DIST = bootstrap.sh config/oln-local.m4 contrib/runtests \
+ config/strip-lrde
###
### Basic doc files generation.
@@ -64,3 +65,20 @@
else \
echo "$@: GNU cppi is required" >&2; \
fi
+
+#<<lrde
+## FIXME: Improve integration.
+# Remove any trace of olena/oln/lrde from the distribution and reset
+# the GNU Build system for the distdir layout.
+dist-hook:
+ $(top_srcdir)/config/strip-lrde $(distdir)/configure.ac && \
+ $(top_srcdir)/config/strip-lrde $(distdir)/Makefile.am && \
+ $(top_srcdir)/config/strip-lrde $(distdir)/olena/oln/Makefile.am && \
+ rm -rf $(distdir)/olena/oln/lrde && \
+ ( \
+ cd $(distdir); \
+ set -evx; \
+ ./bootstrap.sh; \
+ find . -name autom4te.cache | xargs rm -rf \
+ )
+#>>
--- 10.271/olena/oln/Makefile.am Fri, 15 Sep 2006 11:05:05 +0200 levill_r
(oln/q/47_Makefile.a 1.3.1.1.1.6.1.7.1.7.1.3 600)
+++ 10.272/olena/oln/Makefile.am Thu, 08 Feb 2007 18:09:47 +0100 levill_r
(oln/q/47_Makefile.a 1.3.1.1.1.6.1.7.1.7.1.4 600)
@@ -11,10 +11,12 @@
nobase_oln_HEADERS = $(OLN_DEP)
-## -- FIXME: Improve integration. ----------------------------------------
+SUBDIRS = .
+#<<lrde
+## FIXME: Improve integration.
##
-## The contents of `olena/lrde' should be moved to subdirectory of
-## `olena/oln', and the contents of `olena/lrde/ufmt/bin to `olena/tests'
-## or to `tools'.
-SUBDIRS = . lrde
-## ---------------------------------------- FIXME: Improve integration. --
+## The directory `olena/oln/lrde' is a place where we work on algorithms
+## not mature enough to integrate the distribution. Hence it is only
+## available from the Subversion repository, not from the distribution.
+SUBDIRS += lrde
+#>>
Index: 10.271/oln.prj
--- 10.271/oln.prj
+++ 10.272/oln.prj
@@ -1,46 +1,21 @@
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 3)
(Project-Description "Olena")
-(Project-Version oln 10 271)
-(Parent-Version oln 10 270)
+(Project-Version oln 10 272)
+(Parent-Version oln 10 271)
(Version-Log "2007-02-08 Roland Levillain <roland(a)lrde.epita.fr>
- Add new binaries for Salembier et al. algorithm.
-
- * oln/lrde/ufmt/generic_salembier.hh
- (generic_salembier::npoints) [DEBUG]: New attribute.
- (generic_salembier::generic_salembier) [DEBUG]: Initialize it.
- (generic_salembier::update_status) [DEBUG]: New function.
- (generic_salembier::flood) [DEBUG]: Use it.
- * oln/lrde/ufmt/generic_simplified_salembier.hh
- (generic_simplified_salembier::npoints) [DEBUG]: New attribute.
- (generic_simplified_salembier::generic_simplified_salembier)
- [DEBUG]: Initialize it.
- (generic_simplified_salembier::update_status) [DEBUG]: New
- function.
- (generic_simplified_salembier::flood) [DEBUG]: Use it.
- * oln/lrde/ufmt/bin/basic_salembier_float_via_16b.cc,
- * oln/lrde/ufmt/bin/generic_salembier_float_via_16b.cc: New.
- * oln/lrde/ufmt/bin/Makefile.am (check_PROGRAMS): Add
- basic_salembier_float_via_16b and generic_salembier_float_via_16b.
- (basic_salembier_float_via_16b_SOURCES)
- (basic_salembier_float_via_16b_LDFLAGS)
- (generic_salembier_float_via_16b_SOURCES)
- (generic_salembier_float_via_16b_LDFLAGS): New.
- * oln/lrde/ufmt/README: Typo.
-
-
- New tool: pfm-crop.
-
- * oln/lrde/efigi/misc.hh (crop): New function.
- * oln/lrde/efigi/req.hh (equalize_16): New function.
- * oln/lrde/efigi/pfm-crop.cc: New.
- * oln/lrde/efigi/Makefile.am (check_PROGRAMS): Add pfm-crop.
- (pfm_crop_SOURCES): New.
+ Remove olena/oln/lrde from the distribution.
+ * config/strip-lrde: New.
+ * Makefile.am (EXTRA_DIST): Add config/strip-lrde.
+ (dist-hook): New.
+ * configure.ac, Makefile.am, olena/oln/Makefile.am: Use
+ config/strip-lrde to strip everything related to olena/oln/lrde
+ when creating the distribution.
")
(New-Version-Log "")
-(Checkin-Time "Thu, 08 Feb 2007 12:40:28 +0100")
+(Checkin-Time "Thu, 08 Feb 2007 18:09:47 +0100")
(Checkin-Login levill_r)
;; diff-ignore tests/data/.*pbm$
;; diff-ignore .*\.pbm$
@@ -153,7 +128,7 @@
(Project-Keywords)
(Files
- (ChangeLog (oln/o/33_ChangeLog 1.37.1.16.1.17.1.19.1.31 600))
+ (ChangeLog (oln/o/33_ChangeLog 1.37.1.16.1.17.1.19.1.32 600))
(doc/ChangeLog (oln/o/31_ChangeLog 1.38.1.7.1.5.1.14.1.17 600))
(integre/ChangeLog (oln/q/35_ChangeLog 1.12.1.2.1.51 600))
(metalic/ChangeLog (oln/q/30_ChangeLog 1.3.1.44 600))
@@ -169,7 +144,7 @@
(cleanup.sh (oln/o/29_cleanup.sh 1.6 700))
- (configure.ac (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.16.1.12 600))
+ (configure.ac (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.16.1.13 600))
(doc/demo/image.cc (oln/d/46_image.cc 1.8 600))
(doc/demo/Makefile.am (oln/d/44_Makefile.a 1.16.1.2 600))
@@ -185,7 +160,7 @@
(doc/Makefile.am (oln/e/0_Makefile.a 1.14 600))
(doc/ref/processing.tpl (oln/d/48_processing 1.16 600))
- (Makefile.am (oln/n/32_Makefile.a 1.17.1.2.1.8 600))
+ (Makefile.am (oln/n/32_Makefile.a 1.17.1.2.1.9 600))
(NEWS (oln/0_NEWS 1.24 600))
(olena/img/face_se.pbm (oln/n/17_face_se.pb 1.1 600) :no-keywords)
@@ -834,7 +809,7 @@
(integre/tests/check/defs.in (oln/q/42_defs.in 1.1 600))
(metalic/mlc/array/objs.hh (oln/q/45_objs.hh 1.3 600))
(metalic/mlc/config/system.hh (oln/q/46_system.hh 1.2 600))
- (olena/oln/Makefile.am (oln/q/47_Makefile.a 1.3.1.1.1.6.1.7.1.7.1.3 600))
+ (olena/oln/Makefile.am (oln/q/47_Makefile.a 1.3.1.1.1.6.1.7.1.7.1.4 600))
(integre/ntg/config/system.hh (oln/q/48_system.hh 1.2 600))
(metalic/tests/main/tests/is_a1 (oln/r/17_is_a1 1.4 600))
(metalic/tests/main/tests/ensure3 (oln/r/18_ensure3 1.4 600))
@@ -1695,6 +1670,11 @@
(olena/oln/lrde/efigi/pfm-crop.cc (oln/y/15_pfm-crop.c 1.1 644))
(olena/oln/lrde/ufmt/bin/basic_salembier_float_via_16b.cc (oln/y/16_basic_sale 1.1
644))
(olena/oln/lrde/ufmt/bin/generic_salembier_float_via_16b.cc (oln/y/17_generic_sa 1.1
644))
+
+;; Files added byIndex: 10.271/ChangeLog
Index: 10.271/configure.ac
Index: 10.271/Makefile.am
Index: 10.271/olena/oln/Makefile.am
Only in 10.272: config/strip-lrde
populate at Thu, 08 Feb 2007 14:59:08 +0100,
+;; to version 10.271(w), by levill_r:
+
+ (config/strip-lrde (oln/y/18_strip-lrde 1.1 755))
)
(Merge-Parents)
(New-Merge-Parents)