* python/Makefile.am (int_u_ixx_deps, box_ixx_deps) (morpho_ixx_deps): New variables. (int_u8-wrap.cc, int_u32-wrap.cc, box2d-wrap.cc) (box2d_piter-wrap.cc, point2d-wrap.cc, dynamic_image2d-wrap.cc) (image2d_int-wrap.cc, image2d_int_u8-wrap.cc): Add dependencies. --- swilena/ChangeLog | 12 ++++++++++++ swilena/python/Makefile.am | 43 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 1 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index f6a3e78..0860765 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,15 @@ +2010-02-08 Roland Levillain <roland@lrde.epita.fr> + + Improve dependency management in Swilena/Python. + + * python/Makefile.am (int_u_ixx_deps, box_ixx_deps) + (morpho_ixx_deps): + New variables. + (int_u8-wrap.cc, int_u32-wrap.cc, box2d-wrap.cc) + (box2d_piter-wrap.cc, point2d-wrap.cc, dynamic_image2d-wrap.cc) + (image2d_int-wrap.cc, image2d_int_u8-wrap.cc): + Add dependencies. + 2009-11-17 Roland Levillain <roland@lrde.epita.fr> * python/morpho-segm.py: Remove a superfluous semi-colon. diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index 0ad96da..f6a834c 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -188,6 +189,46 @@ CLEANFILES += $(nodist__dynamic_image2d_la_SOURCES) dynamic_image2d.py dynamic_i nodist_python_PYTHON += dynamic_image2d.py +## -------------------- ## +## Extra dependencies. ## +## -------------------- ## + +# FIXME: It would be cool to have them generated automatically. + +# Dependencies pulled by the meta wrapper (.ixx) files. +int_u_ixx_deps = $(top_srcdir)/swilena/python-utils.ixx + +box_ixx_deps = $(top_srcdir)/swilena/coord.ixx + +morpho_ixx_deps = \ + $(top_srcdir)/swilena/concrete.ixx \ + $(top_srcdir)/swilena/ch_value.ixx + +# Dependencies of wrappers not automatically computed (yet). +int_u8-wrap.cc: $(top_srcdir)/swilena/int_u.ixx $(int_u_ixx_deps) +int_u32-wrap.cc: $(top_srcdir)/swilena/int_u.ixx $(int_u_ixx_deps) + +box2d-wrap.cc: $(top_srcdir)/swilena/box.ixx $(box_ixx_deps) +box2d_piter-wrap.cc: $(top_srcdir)/swilena/box_piter.ixx + +point2d-wrap.cc: $(top_srcdir)/swilena/concat.ixx +point2d-wrap.cc: $(top_srcdir)/swilena/python-utils.ixx + +dynamic_image2d-wrap.cc: $(top_srcdir)/swilena/fill.ixx +dynamic_image2d-wrap.cc: $(top_srcdir)/swilena/println.ixx + +image2d_int-wrap.cc: $(top_srcdir)/swilena/image2d.ixx +image2d_int-wrap.cc: $(top_srcdir)/swilena/fill.ixx +image2d_int-wrap.cc: $(top_srcdir)/swilena/println.ixx +image2d_int-wrap.cc: $(top_srcdir)/swilena/morpho.ixx $(morpho_ixx_deps) + +image2d_int_u8-wrap.cc: $(top_srcdir)/swilena/image2d.ixx +image2d_int_u8-wrap.cc: $(top_srcdir)/swilena/pgm.ixx +image2d_int_u8-wrap.cc: $(top_srcdir)/swilena/fill.ixx +image2d_int_u8-wrap.cc: $(top_srcdir)/swilena/println.ixx +image2d_int_u8-wrap.cc: $(top_srcdir)/swilena/morpho.ixx $(morpho_ixx_deps) + + ## ---------------------------- ## ## Swilena Python Shell (sps). ## ## ---------------------------- ## -- 1.5.6.5