Finish elimination of Makefile.ssl (6e07f8a4) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

Configure

+3 −3

Original line number	Diff line number	Diff line
		@@ -610,7 +610,7 @@ my $threads=0;
		my $no_asm=0;
		my $no_dso=0;
		my @skip=();
		my $Makefile="Makefile.ssl";
		my $Makefile="Makefile";
		my $des_locl="crypto/des/des_locl.h";
		my $des ="crypto/des/des.h";
		my $bn ="crypto/bn/bn.h";
		@@ -1492,7 +1492,7 @@ if($IsWindows) {
		printf OUT <<EOF;
		#ifndef MK1MF_BUILD
		/* auto-generated by Configure for crypto/cversion.c:
		* for Unix builds, crypto/Makefile.ssl generates functional definitions;
		* for Unix builds, crypto/Makefile generates functional definitions;
		* Windows builds (and other mk1mf builds) compile cversion.c with
		* -DMK1MF_BUILD and use definitions added to this file by util/mk1mf.pl. */
		#error "Windows builds (PLATFORM=$target) use mk1mf.pl-created Makefiles"
		@@ -1500,7 +1500,7 @@ if($IsWindows) {
		EOF
		close(OUT);
		} else {
		my $make_command = "make -f Makefile.ssl PERL=\'$perl\'";
		my $make_command = "make PERL=\'$perl\'";
		my $make_targets = "";
		$make_targets .= " links" if $symlink;
		$make_targets .= " depend" if $depflags ne "" && $make_depend;

Makefile

+6 −8

Original line number	Diff line number	Diff line
		@@ -192,8 +192,7 @@ FDIRS= sha1 rand des aes dsa rsa
		# should be performed.
		TESTS = alltests

		MAKEFILE= Makefile.ssl
		MAKE= make -f Makefile.ssl
		MAKEFILE= Makefile

		MANDIR=$(OPENSSLDIR)/man
		MAN1=1
		@@ -224,7 +223,7 @@ HEADER= e_os.h
		# When we're prepared to use shared libraries in the programs we link here
		# we might remove 'clean-shared' from the targets to perform at this stage

		all: Makefile.ssl sub_all openssl.pc
		all: Makefile sub_all openssl.pc

		sigs: $(SIGS)
		libcrypto.sha1: libcrypto.a
		@@ -598,7 +597,7 @@ do_reliantunix-shared:
		libs="-l$$i $$libs"; \
		done

		openssl.pc: Makefile.ssl
		openssl.pc: Makefile
		@ ( echo 'prefix=$(INSTALLTOP)'; \
		echo 'exec_prefix=$${prefix}'; \
		echo 'libdir=$${exec_prefix}/lib'; \
		@@ -611,8 +610,8 @@ openssl.pc: Makefile.ssl
		echo 'Libs: -L$${libdir} -lssl -lcrypto $(LIBKRB5) $(EX_LIBS)'; \
		echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc

		Makefile.ssl: Makefile.org
		@echo "Makefile.ssl is older than Makefile.org."
		Makefile: Makefile.org
		@echo "Makefile is older than Makefile.org."
		@echo "Reconfigure the source tree (via './config' or 'perl Configure'), please."
		@false

		@@ -642,7 +641,7 @@ makefile.one: files
		sh util/do_ms.sh

		files:
		$(PERL) $(TOP)/util/files.pl Makefile.ssl > $(TOP)/MINFO
		$(PERL) $(TOP)/util/files.pl Makefile > $(TOP)/MINFO
		@for i in $(DIRS) ;\
		do \
		if [ -d "$$i" ]; then \
		@@ -652,7 +651,6 @@ files:
		done;

		links:
		@$(TOP)/util/point.sh Makefile.ssl Makefile
		@$(PERL) $(TOP)/util/mkdir-p.pl include/openssl
		@$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER)
		@for i in $(DIRS); do \

Makefile.org

+6 −8

Original line number	Diff line number	Diff line
		@@ -190,8 +190,7 @@ FDIRS= sha1 rand des aes dsa rsa
		# should be performed.
		TESTS = alltests

		MAKEFILE= Makefile.ssl
		MAKE= make -f Makefile.ssl
		MAKEFILE= Makefile

		MANDIR=$(OPENSSLDIR)/man
		MAN1=1
		@@ -222,7 +221,7 @@ HEADER= e_os.h
		# When we're prepared to use shared libraries in the programs we link here
		# we might remove 'clean-shared' from the targets to perform at this stage

		all: Makefile.ssl sub_all openssl.pc
		all: Makefile sub_all openssl.pc

		sigs: $(SIGS)
		libcrypto.sha1: libcrypto.a
		@@ -596,7 +595,7 @@ do_reliantunix-shared:
		libs="-l$$i $$libs"; \
		done

		openssl.pc: Makefile.ssl
		openssl.pc: Makefile
		@ ( echo 'prefix=$(INSTALLTOP)'; \
		echo 'exec_prefix=$${prefix}'; \
		echo 'libdir=$${exec_prefix}/lib'; \
		@@ -609,8 +608,8 @@ openssl.pc: Makefile.ssl
		echo 'Libs: -L$${libdir} -lssl -lcrypto $(LIBKRB5) $(EX_LIBS)'; \
		echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc

		Makefile.ssl: Makefile.org
		@echo "Makefile.ssl is older than Makefile.org."
		Makefile: Makefile.org
		@echo "Makefile is older than Makefile.org."
		@echo "Reconfigure the source tree (via './config' or 'perl Configure'), please."
		@false

		@@ -640,7 +639,7 @@ makefile.one: files
		sh util/do_ms.sh

		files:
		$(PERL) $(TOP)/util/files.pl Makefile.ssl > $(TOP)/MINFO
		$(PERL) $(TOP)/util/files.pl Makefile > $(TOP)/MINFO
		@for i in $(DIRS) ;\
		do \
		if [ -d "$$i" ]; then \
		@@ -650,7 +649,6 @@ files:
		done;

		links:
		@$(TOP)/util/point.sh Makefile.ssl Makefile
		@$(PERL) $(TOP)/util/mkdir-p.pl include/openssl
		@$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER)
		@for i in $(DIRS); do \

apps/Makefile

+3 −5

Original line number	Diff line number	Diff line
		#
		# apps/Makefile.ssl
		# apps/Makefile
		#

		DIR= apps
		@@ -10,10 +10,9 @@ CFLAG= -g -static
		INSTALL_PREFIX=
		INSTALLTOP= /usr/local/ssl
		OPENSSLDIR= /usr/local/ssl
		MAKE= make -f Makefile.ssl
		MAKEDEPPROG= makedepend
		MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
		MAKEFILE= Makefile.ssl
		MAKEFILE= Makefile
		PERL= perl
		RM= rm -f
		# KRB5 stuff
		@@ -94,7 +93,7 @@ sreq.o: req.c
		$(CC) -c $(INCLUDES) $(CFLAG) -o sreq.o req.c

		files:
		$(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
		$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO

		install:
		@for i in $(EXE); \
		@@ -121,7 +120,6 @@ tags:
		tests:

		links:
		@sh $(TOP)/util/point.sh Makefile.ssl Makefile

		lint:
		lint -DLINT $(INCLUDES) $(SRC)>fluff

crypto/Makefile

+4 −7

Original line number	Diff line number	Diff line
		@@ -11,10 +11,9 @@ CFLAG= -g
		INSTALL_PREFIX=
		OPENSSLDIR= /usr/local/ssl
		INSTALLTOP= /usr/local/ssl
		MAKE= make -f Makefile.ssl
		MAKEDEPPROG= makedepend
		MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
		MAKEFILE= Makefile.ssl
		MAKEFILE= Makefile
		RM= rm -f
		AR= ar r

		@@ -52,9 +51,9 @@ top:

		all: shared

		buildinf.h: ../Makefile.ssl
		buildinf.h: ../Makefile
		( echo "#ifndef MK1MF_BUILD"; \
		echo ' /* auto-generated by crypto/Makefile.ssl for crypto/cversion.c */'; \
		echo ' /* auto-generated by crypto/Makefile for crypto/cversion.c */'; \
		echo ' #define CFLAGS "$(CC) $(CFLAG)"'; \
		echo ' #define PLATFORM "$(PLATFORM)"'; \
		echo " #define DATE \"`LC_ALL=C LC_TIME=C date`\""; \
		@@ -73,7 +72,7 @@ subdirs:
		done;

		files:
		$(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
		$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
		@for i in $(SDIRS) ;\
		do \
		(cd $$i && echo "making 'files' in crypto/$$i..." && \
		@@ -81,11 +80,9 @@ files:
		done;

		links:
		@sh $(TOP)/util/point.sh Makefile.ssl Makefile
		@$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
		@$(PERL) $(TOP)/util/mklink.pl ../test $(TEST)
		@$(PERL) $(TOP)/util/mklink.pl ../apps $(APPS)
		@sh $(TOP)/util/point.sh Makefile.ssl Makefile
		@for i in $(SDIRS); do \
		(cd $$i && echo "making links in crypto/$$i..." && \
		$(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PERL='${PERL}' links ); \