diff options
| author | pedroGitt <pedro.contreiras@amdocs.com> | 2016-11-23 00:04:58 +0100 |
|---|---|---|
| committer | pedroGitt <pedro.contreiras@amdocs.com> | 2016-11-23 00:04:58 +0100 |
| commit | 7a6897642baa8fc5d9d9f14c80fc4f201cfe2173 (patch) | |
| tree | 9325a7d7d3ac40747f49af22378dcf9bc5c0dd0b /Makefile | |
| parent | c725a561a283f508e68516ded86d141214f5ea06 (diff) | |
| parent | f6c05be8c5d35e725a8a2ed5ad661398ac9f8cd2 (diff) | |
Merge remote-tracking branch 'origin/master' into pedroc/android_e2e_dev
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 20 |
1 files changed, 12 insertions, 8 deletions
@@ -1,7 +1,7 @@ #!/usr/bin/make -f -MAJOR := 1 -MINOR := 3 +MAJOR := 2 +MINOR := 0 PATCH := 0 VERSION := $(MAJOR).$(MINOR).$(PATCH) PREFIX ?= /usr/local @@ -46,6 +46,7 @@ JS_POST := javascript/olm_outbound_group_session.js \ DOCS := tracing/README.html \ docs/megolm.html \ docs/olm.html \ + docs/signing.html \ README.html \ CHANGELOG.html @@ -149,17 +150,20 @@ $(JS_EXPORTED_FUNCTIONS): $(PUBLIC_HEADERS) all: test js lib debug doc .PHONY: all -install-debug: debug - test -d $(DESTDIR)$(PREFIX) || mkdir -p $(DESTDIR)$(PREFIX) - test -d $(DESTDIR)$(PREFIX)/lib || mkdir $(DESTDIR)$(PREFIX)/lib +install-headers: $(PUBLIC_HEADERS) + test -d $(DESTDIR)$(PREFIX)/include/olm || mkdir -p $(DESTDIR)$(PREFIX)/include/olm + install -Dm644 $(PUBLIC_HEADERS) $(DESTDIR)$(PREFIX)/include/olm/ +.PHONY: install-headers + +install-debug: debug install-headers + test -d $(DESTDIR)$(PREFIX)/lib || mkdir -p $(DESTDIR)$(PREFIX)/lib install -Dm755 $(DEBUG_TARGET) $(DESTDIR)$(PREFIX)/lib/libolm_debug.so.$(VERSION) ln -s libolm_debug.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libolm_debug.so.$(MAJOR) ln -s libolm_debug.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libolm_debug.so .PHONY: install-debug -install: lib - test -d $(DESTDIR)$(PREFIX) || mkdir -p $(DESTDIR)$(PREFIX) - test -d $(DESTDIR)$(PREFIX)/lib || mkdir $(DESTDIR)$(PREFIX)/lib +install: lib install-headers + test -d $(DESTDIR)$(PREFIX)/lib || mkdir -p $(DESTDIR)$(PREFIX)/lib install -Dm755 $(RELEASE_TARGET) $(DESTDIR)$(PREFIX)/lib/libolm.so.$(VERSION) ln -s libolm.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libolm.so.$(MAJOR) ln -s libolm.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libolm.so |