Commit 42ba5d23 authored by Ben Laurie's avatar Ben Laurie
Browse files

Blow away Makefile.ssl.

parent c3e64028

Configure

+2 −2
Original line number Diff line number Diff line
@@ -572,7 +572,7 @@ my $no_krb5=0; # but "no-krb5" is implied unless "--with-krb5-..." is used 
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";
@@ -1534,7 +1534,7 @@ if($IsMK1MF) { 
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 $default_depflags && $make_depend;

Makefile.org

+7 −8
Original line number Diff line number Diff line
@@ -117,9 +117,9 @@ SDIRS= \ 
# should be performed.

TESTS = alltests



MAKEFILE= Makefile.ssl

MAKEFILE= Makefile

NEWMAKE=  make

MAKE=     $(NEWMAKE) -f Makefile.ssl

MAKE=     $(NEWMAKE)



MANDIR=$(OPENSSLDIR)/man

MAN1=1
@@ -146,7 +146,7 @@ WTARFILE= $(NAME)-win.tar 
EXHEADER=       e_os2.h

HEADER=         e_os.h



all: Makefile.ssl build_all openssl.pc

all: Makefile build_all openssl.pc



BUILDENV=	PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \

		SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}'	\
@@ -253,7 +253,7 @@ do_$(SHLIB_TARGET): 
		libs="-l$$i $$libs"; \

	done



openssl.pc: Makefile.ssl

openssl.pc: Makefile

	@ ( echo 'prefix=$(INSTALLTOP)'; \

	    echo 'exec_prefix=$${prefix}'; \

	    echo 'libdir=$${exec_prefix}/lib'; \
@@ -266,8 +266,8 @@ openssl.pc: Makefile.ssl 
	    echo 'Libs: -L$${libdir} -lssl -lcrypto $(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
@@ -297,7 +297,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

	@set -e; for i in $(DIRS) ;\

	do \

	if [ -d "$$i" ]; then \
@@ -307,7 +307,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)

	@set -e; target=links; for dir in $(DIRS); do $(BUILD_CMD); done

apps/Makefile.ssl→apps/Makefile

+4 −5
Original line number Diff line number Diff line 
#

#  apps/Makefile.ssl

#  apps/Makefile

#



DIR=		apps
@@ -11,10 +11,10 @@ INSTALL_PREFIX= 
INSTALLTOP=	/usr/local/ssl

OPENSSLDIR=	/usr/local/ssl

NEWMAKE=	make

MAKE=		$(NEWMAKE) -f Makefile.ssl

MAKE=		$(NEWMAKE)

MAKEDEPPROG=	makedepend

MAKEDEPEND=	$(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)

MAKEFILE=	Makefile.ssl

MAKEFILE=	Makefile

PERL=		perl

RM=		rm -f

# KRB5 stuff
@@ -105,7 +105,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:

	@set -e; for i in $(EXE); \
@@ -132,7 +132,6 @@ tags: 
tests:



links:

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



lint:

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

config

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
# Be as similar to the output of config.guess/config.sub

# as possible.



set -x



PREFIX=""

SUFFIX=""

TEST="false"

crypto/Makefile.ssl→crypto/Makefile

+5 −7
Original line number Diff line number Diff line
@@ -11,10 +11,10 @@ CFLAG= -g 
INSTALL_PREFIX=

OPENSSLDIR=     /usr/local/ssl

INSTALLTOP=	/usr/local/ssl

MAKE=           make -f Makefile.ssl

MAKE=           make

MAKEDEPPROG=	makedepend

MAKEDEPEND=	$(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)

MAKEFILE=       Makefile.ssl

MAKEFILE=       Makefile

RM=             rm -f

AR=		ar r
@@ -55,9 +55,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`\""; \
@@ -89,7 +89,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..." && \
@@ -97,11 +97,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 ); \