From: WANG Date: Mon, 16 Sep 2013 15:56:12 +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/1059e1cc0c2ecfa237406949aa26155b6a5b9154?ds=sidebyside Merge branch 'master' of https://scm.cri.ensmp.fr/git/Faustine Conflicts: examples/Makefile --- 1059e1cc0c2ecfa237406949aa26155b6a5b9154 diff --cc examples/Makefile index c7e43eb,befe8b4..30cc6fa --- a/examples/Makefile +++ b/examples/Makefile @@@ -1,15 -1,11 +1,10 @@@ - #SOURCES = $(wildcard */*.dsp) - #MAKEFILES = $(wildcard */Makefile) - EXAMPLES = 2d_fft close dilation erosion fft licenceplate open primitives sinwave -SOURCES = $(wildcard */*.dsp) -DIRS = sinwave fft primitives # 2d_fft close fft open sinwave dilation erosion licenseplate primitives ++EXAMPLES = 2d_fft close dilation erosion fft open primitives sinwave #licenceplate -all: make-each-example +all: examples -define mytarget - make-each-example:: ; $(MAKE) -C $1 -endef +examples:: - echo "Making all the examples, it may take several mins..." - @$(foreach example, $(EXAMPLES), cd $(example) && make && cd ..;) ++ @echo "Making all the examples, it may take several minutes..." ++ @$(foreach example, $(EXAMPLES), $(MAKE) -C $(example);) -$(foreach dir,$(DIRS),$(eval $(call mytarget,$(dir)))) - +clean:: - @$(foreach example, $(EXAMPLES), cd $(example) && make clean && cd ..;) - - #examples: - # cd primitives && make ++ @$(foreach example, $(EXAMPLES), $(MAKE) -C $(example) clean;)