1*4882a593SmuzhiyunFrom 060b9b4147f6e5ff386a8b017796118d783e59fa Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Matt Weber <matthew.weber@rockwellcollins.com> 3*4882a593SmuzhiyunDate: Tue, 22 Oct 2019 12:44:30 -0500 4*4882a593SmuzhiyunSubject: [PATCH] Makefile: cleanup install for rebuilds 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunSupport the ability to rebuild and redeploy without a clean. This 7*4882a593Smuzhiyunrequired some force linking and man archive creation. 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunProvide the ability to override the stripping of the shared lib for 10*4882a593Smuzhiyuncases where a embedded target build may want to control stripping 11*4882a593Smuzhiyunor provide cross arch tools. 12*4882a593Smuzhiyun 13*4882a593SmuzhiyunSigned-off-by: Matthew Weber <matthew.weber@rockwellcollins.com> 14*4882a593SmuzhiyunSigned-off-by: Stephan Mueller <smueller@chronox.de> 15*4882a593Smuzhiyun[Retrieved from: 16*4882a593Smuzhiyunhttps://github.com/smuellerDD/jitterentropy-library/commit/060b9b4147f6e5ff386a8b017796118d783e59fa] 17*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 18*4882a593Smuzhiyun--- 19*4882a593Smuzhiyun Makefile | 10 ++++++---- 20*4882a593Smuzhiyun 1 file changed, 6 insertions(+), 4 deletions(-) 21*4882a593Smuzhiyun 22*4882a593Smuzhiyundiff --git a/Makefile b/Makefile 23*4882a593Smuzhiyunindex 4ff069b..2e78607 100644 24*4882a593Smuzhiyun--- a/Makefile 25*4882a593Smuzhiyun+++ b/Makefile 26*4882a593Smuzhiyun@@ -14,6 +14,8 @@ LIBDIR := lib 27*4882a593Smuzhiyun # include target directory 28*4882a593Smuzhiyun INCDIR := include 29*4882a593Smuzhiyun 30*4882a593Smuzhiyun+INSTALL_STRIP ?= install -s 31*4882a593Smuzhiyun+ 32*4882a593Smuzhiyun NAME := jitterentropy 33*4882a593Smuzhiyun LIBMAJOR=$(shell cat jitterentropy-base.c | grep define | grep MAJVERSION | awk '{print $$3}') 34*4882a593Smuzhiyun LIBMINOR=$(shell cat jitterentropy-base.c | grep define | grep MINVERSION | awk '{print $$3}') 35*4882a593Smuzhiyun@@ -58,15 +60,15 @@ cppcheck: 36*4882a593Smuzhiyun install: 37*4882a593Smuzhiyun install -d -m 0755 $(DESTDIR)$(PREFIX)/share/man/man3 38*4882a593Smuzhiyun install -m 644 doc/$(NAME).3 $(DESTDIR)$(PREFIX)/share/man/man3/ 39*4882a593Smuzhiyun- gzip -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3 40*4882a593Smuzhiyun+ gzip -f -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3 41*4882a593Smuzhiyun install -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR) 42*4882a593Smuzhiyun- install -m 0755 -s lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/ 43*4882a593Smuzhiyun+ $(INSTALL_STRIP) -m 0755 lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/ 44*4882a593Smuzhiyun install -d -m 0755 $(DESTDIR)$(PREFIX)/$(INCDIR) 45*4882a593Smuzhiyun install -m 0644 jitterentropy.h $(DESTDIR)$(PREFIX)/$(INCDIR)/ 46*4882a593Smuzhiyun install -m 0644 jitterentropy-base-user.h $(DESTDIR)$(PREFIX)/$(INCDIR)/ 47*4882a593Smuzhiyun $(RM) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR) 48*4882a593Smuzhiyun- ln -s lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR) 49*4882a593Smuzhiyun- ln -s lib$(NAME).so.$(LIBMAJOR) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so 50*4882a593Smuzhiyun+ ln -sf lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR) 51*4882a593Smuzhiyun+ ln -sf lib$(NAME).so.$(LIBMAJOR) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so 52*4882a593Smuzhiyun 53*4882a593Smuzhiyun clean: 54*4882a593Smuzhiyun @- $(RM) $(NAME) 55