From: Michel Pollet <buserror@gmail.com>
Date: Wed, 6 Nov 2013 15:16:19 +0000 (+0000)
Subject: Merge branch 'master' of /home/michel/Sources/Embedded/simavr
X-Git-Tag: v1.6~83
X-Git-Url: https://git.htl-mechatronik.at/public/?a=commitdiff_plain;h=fd60ce9e7e6a3b84196aa6c320a80c9ce705c4f2;p=sx%2Fsimavr.git

Merge branch 'master' of /home/michel/Sources/Embedded/simavr

Conflicts:
	shared/simavr/Makefile
---

fd60ce9e7e6a3b84196aa6c320a80c9ce705c4f2
diff --cc Makefile
index 65085af,cf4ceaa..d17b46b
--- a/Makefile
+++ b/Makefile
@@@ -3,17 -12,20 +12,23 @@@ RELEASE	?= 
  all:	build-simavr build-tests build-examples
  
  build-simavr:
- 	$(MAKE) -C simavr
+ 	$(MAKE) -C simavr RELEASE=$(RELEASE)
  
  build-tests: build-simavr
- 	$(MAKE) -C tests
+ 	$(MAKE) -C tests RELEASE=$(RELEASE)
  
  build-examples: build-simavr
- 	$(MAKE) -C examples
+ 	$(MAKE) -C examples RELEASE=$(RELEASE)
+ 
+ install:
+ 	$(MAKE) -C simavr install RELEASE=$(RELEASE)
+ 
+ doc:
+ 	$(MAKE) -C doc RELEASE=$(RELEASE)
  
 +install:
 +	$(MAKE) -C simavr install
 +
  clean:
  	$(MAKE) -C simavr clean
  	$(MAKE) -C tests clean