From: Karim Barkati <karimbarkati@gmail.com>
Date: Mon, 16 Sep 2013 13:59:05 +0000 (+0200)
Subject: Merge branch 'master' of https://scm.cri.ensmp.fr/git/Faustine
X-Git-Url: https://scm.cri.mines-paristech.fr/git/Faustine.git/commitdiff_plain/c21be74684e409aaf08937e776c6cedce35b8fc0?ds=sidebyside;hp=--cc

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

Conflicts:
	examples/Makefile
---

c21be74684e409aaf08937e776c6cedce35b8fc0
diff --cc examples/Makefile
index b004c88,66667e1..befe8b4
--- a/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))))
- 
+