Merge branch 'mbedtls-1.3' into development

* mbedtls-1.3:
  Actually use armcc for the armcc test ^^'
  Add more -O level variety in all.sh
  Document recent make changes
  build: Makefile: cleanup CFLAGS
  build: Makefile: cleanup LDFLAGS
  build: Makefile: simplify root Makefile
  build: Makefile: remove bashism

Conflicts:
	programs/Makefile
This commit is contained in:
Manuel Pégourié-Gonnard 2015-03-13 16:32:40 +00:00
commit cc0d084820
7 changed files with 160 additions and 149 deletions

View file

@ -4,17 +4,18 @@ PREFIX=mbedtls_
.SILENT:
all:
cd library && $(MAKE) all && cd ..
cd programs && $(MAKE) all && cd ..
cd tests && $(MAKE) all && cd ..
all: programs tests
no_test:
cd library && $(MAKE) all && cd ..
cd programs && $(MAKE) all && cd ..
no_test: programs
programs: lib
$(MAKE) -C programs
lib:
cd library && $(MAKE) all && cd ..
$(MAKE) -C library
tests: lib
$(MAKE) -C tests
install:
mkdir -p $(DESTDIR)/include/mbedtls
@ -47,13 +48,13 @@ uninstall:
done
clean:
cd library && $(MAKE) clean && cd ..
cd programs && $(MAKE) clean && cd ..
cd tests && $(MAKE) clean && cd ..
$(MAKE) -C library clean
$(MAKE) -C programs clean
$(MAKE) -C tests clean
find . \( -name \*.gcno -o -name \*.gcda -o -name *.info \) -exec rm {} +
check: lib
( cd tests && $(MAKE) && $(MAKE) check )
check: tests
$(MAKE) -C tests check
test-ref-configs:
tests/scripts/test-ref-configs.pl