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

Use correct CFLAG definition for makefile.one builds.

parent 488c0657

CHANGES

+4 −3
Original line number Diff line number Diff line
@@ -30,9 +30,10 @@ 
  *) The -DPLATFORM="\"$(PLATFORM)\"" definition and the similar -DCFLAGS=...

     (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 made

     in auto-generated file crypto/buildinf.h, which also defines DATE

     and thus replaces crypto/date.h.

     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).

     [Bodo Moeller]



  *) MIPS III/IV assembler module is reimplemented.

Configure

+2 −0
Original line number Diff line number Diff line
@@ -710,11 +710,13 @@ if($IsWindows) { 
	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"

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";

} else {

	(system "make -f Makefile.ssl PERL=\'$perl\' links") == 0 or exit $?;

crypto/.cvsignore

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

buildinf.h

mk1mfinf.h

opensslconf.h

Makefile.save

crypto/Makefile.ssl

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ all: buildinf.h lib subdirs 


buildinf.h: ../Makefile.ssl

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

	echo "/* (Windows builds: auto-generated by Configure) */"; \

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

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

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

	echo "#define DATE \"`date`\"" ) >buildinf.h
@@ -129,7 +129,7 @@ depend: 
	done;



clean:

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

	rm -f buildinf.h mk1mfinf.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

+6 −1
Original line number Diff line number Diff line
@@ -60,7 +60,12 @@ 
#include <string.h>

#include "cryptlib.h"

#include <openssl/crypto.h>



#ifdef MK1MF_BUILD

# include "mk1mfinf.h"

#else

# include "buildinf.h"

#endif



const char *SSLeay_version(int t)

	{