Merge branch 'master' of https://scm.cri.ensmp.fr/git/Faustine

Conflicts:
	examples/Makefile

diff --combined examples/Makefile
index b004c88,66667e1..befe8b4
--- 1/examples/Makefile
--- 2/examples/Makefile
+++ b/examples/Makefile
@@@ -1,11 -1,4 +1,11 @@@
  SOURCES = $(wildcard */*.dsp)
 +DIRS = sinwave fft primitives # 2d_fft close fft open sinwave dilation erosion licenseplate primitives
  
 -all: $(SOURCES)
 +all: make-each-example
 +
 +define mytarget
 +  make-each-example:: ; $(MAKE) -C $1
 +endef
 +
 +$(foreach dir,$(DIRS),$(eval $(call mytarget,$(dir))))
- 
+