|  | @@ -0,0 +1,145 @@
 | 
	
		
			
				|  |  | +diff -Nur openssl-1.0.2a.orig/crypto/Makefile openssl-1.0.2a/crypto/Makefile
 | 
	
		
			
				|  |  | +--- openssl-1.0.2a.orig/crypto/Makefile	2015-03-19 14:31:02.000000000 +0100
 | 
	
		
			
				|  |  | ++++ openssl-1.0.2a/crypto/Makefile	2015-05-25 15:20:59.000000000 +0200
 | 
	
		
			
				|  |  | +@@ -85,11 +85,11 @@
 | 
	
		
			
				|  |  | + 	@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
 | 
	
		
			
				|  |  | + 
 | 
	
		
			
				|  |  | + subdirs:
 | 
	
		
			
				|  |  | +-	@target=all; $(RECURSIVE_MAKE)
 | 
	
		
			
				|  |  | ++	+@target=all; $(RECURSIVE_MAKE)
 | 
	
		
			
				|  |  | + 
 | 
	
		
			
				|  |  | + files:
 | 
	
		
			
				|  |  | + 	$(PERL) $(TOP)/util/files.pl "CPUID_OBJ=$(CPUID_OBJ)" Makefile >> $(TOP)/MINFO
 | 
	
		
			
				|  |  | +-	@target=files; $(RECURSIVE_MAKE)
 | 
	
		
			
				|  |  | ++	+@target=files; $(RECURSIVE_MAKE)
 | 
	
		
			
				|  |  | + 
 | 
	
		
			
				|  |  | + links:
 | 
	
		
			
				|  |  | + 	@$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
 | 
	
		
			
				|  |  | +@@ -100,7 +100,7 @@
 | 
	
		
			
				|  |  | + # lib: $(LIB): are splitted to avoid end-less loop
 | 
	
		
			
				|  |  | + lib:	$(LIB)
 | 
	
		
			
				|  |  | + 	@touch lib
 | 
	
		
			
				|  |  | +-$(LIB):	$(LIBOBJ)
 | 
	
		
			
				|  |  | ++$(LIB):	$(LIBOBJ) | subdirs
 | 
	
		
			
				|  |  | + 	$(AR) $(LIB) $(LIBOBJ)
 | 
	
		
			
				|  |  | + 	test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
 | 
	
		
			
				|  |  | + 	$(RANLIB) $(LIB) || echo Never mind.
 | 
	
		
			
				|  |  | +@@ -111,7 +111,7 @@
 | 
	
		
			
				|  |  | + 	fi
 | 
	
		
			
				|  |  | + 
 | 
	
		
			
				|  |  | + libs:
 | 
	
		
			
				|  |  | +-	@target=lib; $(RECURSIVE_MAKE)
 | 
	
		
			
				|  |  | ++	+@target=lib; $(RECURSIVE_MAKE)
 | 
	
		
			
				|  |  | + 
 | 
	
		
			
				|  |  | + install:
 | 
	
		
			
				|  |  | + 	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
 | 
	
		
			
				|  |  | +@@ -120,7 +120,7 @@
 | 
	
		
			
				|  |  | + 	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
 | 
	
		
			
				|  |  | + 	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
 | 
	
		
			
				|  |  | + 	done;
 | 
	
		
			
				|  |  | +-	@target=install; $(RECURSIVE_MAKE)
 | 
	
		
			
				|  |  | ++	+@target=install; $(RECURSIVE_MAKE)
 | 
	
		
			
				|  |  | + 
 | 
	
		
			
				|  |  | + lint:
 | 
	
		
			
				|  |  | + 	@target=lint; $(RECURSIVE_MAKE)
 | 
	
		
			
				|  |  | +diff -Nur openssl-1.0.2a.orig/crypto/objects/Makefile openssl-1.0.2a/crypto/objects/Makefile
 | 
	
		
			
				|  |  | +--- openssl-1.0.2a.orig/crypto/objects/Makefile	2015-03-19 14:31:02.000000000 +0100
 | 
	
		
			
				|  |  | ++++ openssl-1.0.2a/crypto/objects/Makefile	2015-05-25 15:20:59.000000000 +0200
 | 
	
		
			
				|  |  | +@@ -44,11 +44,11 @@
 | 
	
		
			
				|  |  | + # objects.pl both reads and writes obj_mac.num
 | 
	
		
			
				|  |  | + obj_mac.h: objects.pl objects.txt obj_mac.num
 | 
	
		
			
				|  |  | + 	$(PERL) objects.pl objects.txt obj_mac.num obj_mac.h
 | 
	
		
			
				|  |  | +-	@sleep 1; touch obj_mac.h; sleep 1
 | 
	
		
			
				|  |  | + 
 | 
	
		
			
				|  |  | +-obj_xref.h: objxref.pl obj_xref.txt obj_mac.num
 | 
	
		
			
				|  |  | ++# This doesn't really need obj_mac.h, but since that rule reads & writes
 | 
	
		
			
				|  |  | ++# obj_mac.num, we can't run in parallel with it.
 | 
	
		
			
				|  |  | ++obj_xref.h: objxref.pl obj_xref.txt obj_mac.num obj_mac.h
 | 
	
		
			
				|  |  | + 	$(PERL) objxref.pl obj_mac.num obj_xref.txt > obj_xref.h
 | 
	
		
			
				|  |  | +-	@sleep 1; touch obj_xref.h; sleep 1
 | 
	
		
			
				|  |  | + 
 | 
	
		
			
				|  |  | + files:
 | 
	
		
			
				|  |  | + 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 | 
	
		
			
				|  |  | +diff -Nur openssl-1.0.2a.orig/engines/Makefile openssl-1.0.2a/engines/Makefile
 | 
	
		
			
				|  |  | +--- openssl-1.0.2a.orig/engines/Makefile	2015-03-19 14:31:14.000000000 +0100
 | 
	
		
			
				|  |  | ++++ openssl-1.0.2a/engines/Makefile	2015-05-25 15:20:59.000000000 +0200
 | 
	
		
			
				|  |  | +@@ -72,7 +72,7 @@
 | 
	
		
			
				|  |  | + 
 | 
	
		
			
				|  |  | + all:	lib subdirs
 | 
	
		
			
				|  |  | + 
 | 
	
		
			
				|  |  | +-lib:	$(LIBOBJ)
 | 
	
		
			
				|  |  | ++lib:	$(LIBOBJ) | subdirs
 | 
	
		
			
				|  |  | + 	@if [ -n "$(SHARED_LIBS)" ]; then \
 | 
	
		
			
				|  |  | + 		set -e; \
 | 
	
		
			
				|  |  | + 		for l in $(LIBNAMES); do \
 | 
	
		
			
				|  |  | +@@ -89,7 +89,7 @@
 | 
	
		
			
				|  |  | + 
 | 
	
		
			
				|  |  | + subdirs:
 | 
	
		
			
				|  |  | + 	echo $(EDIRS)
 | 
	
		
			
				|  |  | +-	@target=all; $(RECURSIVE_MAKE)
 | 
	
		
			
				|  |  | ++	+@target=all; $(RECURSIVE_MAKE)
 | 
	
		
			
				|  |  | + 
 | 
	
		
			
				|  |  | + files:
 | 
	
		
			
				|  |  | + 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 | 
	
		
			
				|  |  | +@@ -128,7 +128,7 @@
 | 
	
		
			
				|  |  | + 			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
 | 
	
		
			
				|  |  | + 		done; \
 | 
	
		
			
				|  |  | + 	fi
 | 
	
		
			
				|  |  | +-	@target=install; $(RECURSIVE_MAKE)
 | 
	
		
			
				|  |  | ++	+@target=install; $(RECURSIVE_MAKE)
 | 
	
		
			
				|  |  | + 
 | 
	
		
			
				|  |  | + tags:
 | 
	
		
			
				|  |  | + 	ctags $(SRC)
 | 
	
		
			
				|  |  | +diff -Nur openssl-1.0.2a.orig/Makefile.org openssl-1.0.2a/Makefile.org
 | 
	
		
			
				|  |  | +--- openssl-1.0.2a.orig/Makefile.org	2015-03-19 14:30:36.000000000 +0100
 | 
	
		
			
				|  |  | ++++ openssl-1.0.2a/Makefile.org	2015-05-25 15:20:59.000000000 +0200
 | 
	
		
			
				|  |  | +@@ -274,17 +274,17 @@
 | 
	
		
			
				|  |  | + build_libs: build_crypto build_ssl build_engines
 | 
	
		
			
				|  |  | + 
 | 
	
		
			
				|  |  | + build_crypto:
 | 
	
		
			
				|  |  | +-	@dir=crypto; target=all; $(BUILD_ONE_CMD)
 | 
	
		
			
				|  |  | +-build_ssl:
 | 
	
		
			
				|  |  | +-	@dir=ssl; target=all; $(BUILD_ONE_CMD)
 | 
	
		
			
				|  |  | +-build_engines:
 | 
	
		
			
				|  |  | +-	@dir=engines; target=all; $(BUILD_ONE_CMD)
 | 
	
		
			
				|  |  | +-build_apps:
 | 
	
		
			
				|  |  | +-	@dir=apps; target=all; $(BUILD_ONE_CMD)
 | 
	
		
			
				|  |  | +-build_tests:
 | 
	
		
			
				|  |  | +-	@dir=test; target=all; $(BUILD_ONE_CMD)
 | 
	
		
			
				|  |  | +-build_tools:
 | 
	
		
			
				|  |  | +-	@dir=tools; target=all; $(BUILD_ONE_CMD)
 | 
	
		
			
				|  |  | ++	+@dir=crypto; target=all; $(BUILD_ONE_CMD)
 | 
	
		
			
				|  |  | ++build_ssl: build_crypto
 | 
	
		
			
				|  |  | ++	+@dir=ssl; target=all; $(BUILD_ONE_CMD)
 | 
	
		
			
				|  |  | ++build_engines: build_crypto
 | 
	
		
			
				|  |  | ++	+@dir=engines; target=all; $(BUILD_ONE_CMD)
 | 
	
		
			
				|  |  | ++build_apps: build_libs
 | 
	
		
			
				|  |  | ++	+@dir=apps; target=all; $(BUILD_ONE_CMD)
 | 
	
		
			
				|  |  | ++build_tests: build_libs
 | 
	
		
			
				|  |  | ++	+@dir=test; target=all; $(BUILD_ONE_CMD)
 | 
	
		
			
				|  |  | ++build_tools: build_libs
 | 
	
		
			
				|  |  | ++	+@dir=tools; target=all; $(BUILD_ONE_CMD)
 | 
	
		
			
				|  |  | + 
 | 
	
		
			
				|  |  | + all_testapps: build_libs build_testapps
 | 
	
		
			
				|  |  | + build_testapps:
 | 
	
		
			
				|  |  | +diff -Nur openssl-1.0.2a.orig/test/Makefile openssl-1.0.2a/test/Makefile
 | 
	
		
			
				|  |  | +--- openssl-1.0.2a.orig/test/Makefile	2015-03-19 14:31:16.000000000 +0100
 | 
	
		
			
				|  |  | ++++ openssl-1.0.2a/test/Makefile	2015-05-25 15:20:59.000000000 +0200
 | 
	
		
			
				|  |  | +@@ -133,7 +133,7 @@
 | 
	
		
			
				|  |  | + tags:
 | 
	
		
			
				|  |  | + 	ctags $(SRC)
 | 
	
		
			
				|  |  | + 
 | 
	
		
			
				|  |  | +-tests:	exe apps $(TESTS)
 | 
	
		
			
				|  |  | ++tests:	exe $(TESTS)
 | 
	
		
			
				|  |  | + 
 | 
	
		
			
				|  |  | + apps:
 | 
	
		
			
				|  |  | + 	@(cd ..; $(MAKE) DIRS=apps all)
 | 
	
		
			
				|  |  | +@@ -529,7 +529,7 @@
 | 
	
		
			
				|  |  | + #	fi
 | 
	
		
			
				|  |  | + 
 | 
	
		
			
				|  |  | + dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
 | 
	
		
			
				|  |  | +-	@target=dummytest; $(BUILD_CMD)
 | 
	
		
			
				|  |  | ++	+@target=dummytest; $(BUILD_CMD)
 | 
	
		
			
				|  |  | + 
 | 
	
		
			
				|  |  | + # DO NOT DELETE THIS LINE -- make depend depends on it.
 | 
	
		
			
				|  |  | + 
 |