| commit | 9a73632fd9f4e08047b88230c24aa2133c8f880e | [log] [tgz] |
|---|---|---|
| author | Paul Bakker <p.j.bakker@polarssl.org> | Wed Nov 14 12:39:52 2012 +0000 |
| committer | Paul Bakker <p.j.bakker@polarssl.org> | Wed Nov 14 12:39:52 2012 +0000 |
| tree | ceb8276cd26f17ba556397ae81b192bbbc885909 | |
| parent | 97872aceb6d438617b3b325cd7e0b402f3ae882f [diff] [blame] |
- Merged changesets 1399 up to and including 1415 into 1.2 branch
diff --git a/library/Makefile b/library/Makefile index 7983f7b..603f5d1 100644 --- a/library/Makefile +++ b/library/Makefile
@@ -18,7 +18,9 @@ # CFLAGS += -D_BSD_EXTENSION # To compile as a shared library: -# CFLAGS += -fPIC +ifdef SHARED +CFLAGS += -fPIC +endif SONAME=libpolarssl.so.0 @@ -51,7 +53,11 @@ .SILENT: +ifndef SHARED all: static +else +all: shared +endif static: libpolarssl.a