Commit 57119943 authored by Bodo Möller's avatar Bodo Möller
Browse files

Always use buildinf.h, which now includes the mk1mfinf.h data. 

Using different files caused problems because the dependencies
in the Makefiles produced by mk1mf.pl were for the standard case,
i.e. mentioned buildinf.h and not mk1mfinf.h.
parent 37b7185b

CHANGES

+2 −3
Original line number Diff line number Diff line
@@ -46,9 +46,8 @@ 
     (both in crypto/Makefile.ssl for use by crypto/cversion.c) caused

     problems not only on Windows, but also on some Unix platforms.

     To avoid problematic command lines, these definitions are now in an

     auto-generated file, which also defines DATE and thus replaces

     crypto/date.h.  Standard "make" builds use crypto/buildinf.h,

     mk1mf.pl builds use crypto/mk1mfinf.h (created by mk1mf.pl).

     auto-generated file crypto/buildinf.h (created by crypto/Makefile.ssl

     for standard "make" builds, by util/mk1mf.pl for "mk1mf" builds).

     [Bodo Moeller]



  *) MIPS III/IV assembler module is reimplemented.

Configure

+7 −6
Original line number Diff line number Diff line
@@ -708,13 +708,14 @@ print "BF_PTR2 used\n" if $bf_ptr == 2; 
if($IsWindows) {

	open (OUT,">crypto/buildinf.h") || die "Can't open buildinf.h";

	printf OUT <<EOF;

/* auto-generated by Configure for crypto/cversion.c */

/* (Unix builds: auto-generated by crypto/Makefile.ssl) */

/* mk1mf builds use mk1mfinf.h instead, so this file is probably never needed */

#define CFLAGS "$cc $cflags"

#define PLATFORM "$target"

#ifndef MK1MF_BUILD

  /* auto-generated by Configure for crypto/cversion.c:

   * for Unix builds, crypto/Makefile.ssl 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"

#endif

EOF

	printf OUT "#define DATE \"%s\"\n", scalar gmtime();

	close(OUT);



	system "perl crypto/objects/obj_dat.pl <crypto/objects/objects.h >crypto/objects/obj_dat.h";

crypto/.cvsignore

+0 −1
Original line number Diff line number Diff line 
lib

buildinf.h

mk1mfinf.h

opensslconf.h

Makefile.save

crypto/Makefile.ssl

+7 −6
Original line number Diff line number Diff line
@@ -50,11 +50,12 @@ top: 
all: buildinf.h lib subdirs



buildinf.h: ../Makefile.ssl

	( echo "/* auto-generated by crypto/Makefile.ssl for crypto/cversion.c */"; \

	echo "/* (mk1mf builds use mk1mfinf.h instead) */"; \

	( echo "#ifndef MK1MF_BUILD"; \

	echo "  /* auto-generated by crypto/Makefile.ssl for crypto/cversion.c */"; \

	echo "  #define CFLAGS \"$(CC) $(CFLAG)\""; \

	echo "  #define PLATFORM \"$(PLATFORM)\""; \

	echo "#define DATE \"`date`\"" ) >buildinf.h

	echo "  #define DATE \"`date`\""; \

	echo "#endif" ) >buildinf.h



subdirs:

	@for i in $(SDIRS) ;\
@@ -129,7 +130,7 @@ depend: 
	done;



clean:

	rm -f buildinf.h mk1mfinf.h *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

	rm -f buildinf.h *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

	@for i in $(SDIRS) ;\

	do \

	(cd $$i; echo "making clean in crypto/$$i..."; \

crypto/cversion.c

+1 −5
Original line number Diff line number Diff line
@@ -61,11 +61,7 @@ 
#include "cryptlib.h"

#include <openssl/crypto.h>



#ifdef MK1MF_BUILD

# include "mk1mfinf.h"

#else

#include "buildinf.h"

#endif



const char *SSLeay_version(int t)

	{