head	1.6;
access;
symbols
	RELEASE_8_3_0:1.6
	RELEASE_9_0_0:1.6
	RELEASE_7_4_0:1.5
	RELEASE_8_2_0:1.5
	RELEASE_6_EOL:1.5
	RELEASE_8_1_0:1.5
	RELEASE_7_3_0:1.5
	RELEASE_8_0_0:1.5
	RELEASE_7_2_0:1.5
	RELEASE_7_1_0:1.5
	RELEASE_6_4_0:1.5
	RELEASE_5_EOL:1.5
	RELEASE_7_0_0:1.5
	RELEASE_6_3_0:1.5
	PRE_XORG_7:1.5
	RELEASE_4_EOL:1.4
	RELEASE_6_2_0:1.3;
locks; strict;
comment	@# @;


1.6
date	2011.03.04.14.43.50;	author ale;	state Exp;
branches;
next	1.5;

1.5
date	2007.03.30.12.53.21;	author ale;	state Exp;
branches;
next	1.4;

1.4
date	2006.11.13.07.24.25;	author ale;	state Exp;
branches;
next	1.3;

1.3
date	2006.07.14.07.06.17;	author ale;	state Exp;
branches;
next	1.2;

1.2
date	2003.08.11.02.15.56;	author foxfair;	state dead;
branches;
next	1.1;

1.1
date	2003.06.21.06.11.50;	author foxfair;	state Exp;
branches;
next	;


desc
@@


1.6
log
@Update to 3.4.0 release and add support for amd64.
@
text
@--- makefile.orig	2010-11-19 04:08:54.000000000 +0100
+++ makefile	2011-03-04 15:30:09.000000000 +0100
@@@@ -1651,7 +1651,7 @@@@ FreeBSD:
 	@@if uname -m | grep "i[3,4,5,6]86" > /dev/null; then \
 		./tools/buildasm.sh $(AS) $(OBJPATH) ; \
 		make $(DEFINES) EXTRAOBJS="$(ASMOBJS)" CFLAGS="$(CFLAGS) -DUSE_ASM \
-			-fomit-frame-pointer -pthread" ; \
+			%%CFLAGS%% %%PTHREAD_CFLAGS%%" ; \
 	else \
 		make $(DEFINES) CFLAGS="$(CFLAGS) -fomit-frame-pointer -pthread" ; \
 	fi
@


1.5
log
@Update to 3.3.1 release.
@
text
@d1 3
a3 3
--- makefile.orig	Sat Jan 27 22:14:40 2007
+++ makefile	Fri Mar 30 14:40:47 2007
@@@@ -1340,7 +1340,7 @@@@
d7 1
a7 1
-			-fomit-frame-pointer -O3 -pthread" ; \
d10 2
a11 2
 		make $(DEFINES) EXTRAOBJS="$(ASMOBJS)" CFLAGS="$(CFLAGS) -DUSE_ASM \
 			-fomit-frame-pointer -O3 -pthread" ; \
@


1.4
log
@Fix build on 4.x.
@
text
@d1 11
a11 11
--- makefile.orig	Fri Jul 14 08:16:12 2006
+++ makefile	Fri Jul 14 08:17:26 2006
@@@@ -1349,7 +1349,7 @@@@
 FreeBSD:
 	@@./tools/buildasm.sh $(AS) $(OBJPATH)
 	make $(DEFINES) EXTRAOBJS="$(ASMOBJS)" CFLAGS="$(CFLAGS) -DUSE_ASM \
-		-fomit-frame-pointer -O3 -pthread"
+		%%CFLAGS%% %%PTHREAD_CFLAGS%%"
 NetBSD:
 	@@./tools/buildasm.sh $(AS) $(OBJPATH)
 	make $(DEFINES) EXTRAOBJS="$(ASMOBJS)" CFLAGS="$(CFLAGS) -DUSE_ASM \
@


1.3
log
@Update to 3.2.3 release:
- OPTIONSify (respect CFLAGS / OPTIMIZED_CFLAGS)
- Add support for PKCS#11 tokens
- Grap maintainership
@
text
@d8 1
a8 1
+		%%CFLAGS%% %%PTHREAD_CFLAGS%% %%PTHREAD_LIBS%%"
@


1.2
log
@Update to cryptlib 3.1 beta5, and change MAKE_ARGS to ALL_TARGET to prevent
a 'make all' failure.
@
text
@d1 3
a3 14
--- makefile.orig	Tue Jun 17 12:28:06 2003
+++ makefile	Tue Jun 17 13:47:16 2003
@@@@ -709,7 +709,7 @@@@
 						$(CC) $(CFLAGS) misc/keyex.c -o $(OBJPATH)keyex.o
 
 $(OBJPATH)keyex_rw.o:	$(CRYPT_DEP) $(ASN1_DEP) misc/objinfo.h misc/keyex_rw.c
-						$(CC) $(CFLAGS) misc/keyex_rw.c -o $(OBJPATH)/keyex_rw.o
+						$(CC) $(CFLAGS) misc/keyex_rw.c -o $(OBJPATH)keyex_rw.o
 
 $(OBJPATH)net_cmp.o:	$(CRYPT_DEP) misc/net_cmp.c
 						$(CC) $(CFLAGS) misc/net_cmp.c -o $(OBJPATH)net_cmp.o
@@@@ -1171,11 +1171,11 @@@@
 #	@@make asm_out
 	@@make $(DEFINES) CC=gcc CFLAGS="$(CFLAGS) -fomit-frame-pointer -O3"
d5 7
a11 22
-	@@echo "The most common version of this OS uses an incredibly old version of as"
-	@@echo "which doesn't handle 486 opcodes, so the asm code is disabled by default."
-	@@echo "If you've upgraded to a newer as, uncomment the 'make asm_out' line"
-	@@echo "in the FreeBSD section of the makefile to use the much faster asm code."
-#	@@make asm_out
+#	@@echo "The most common version of this OS uses an incredibly old version of as"
+#	@@echo "which doesn't handle 486 opcodes, so the asm code is disabled by default."
+#	@@echo "If you've upgraded to a newer as, uncomment the 'make asm_out' line"
+#	@@echo "in the FreeBSD section of the makefile to use the much faster asm code."
+	@@make asm_out
 	@@make $(DEFINES) CFLAGS="$(CFLAGS) -fomit-frame-pointer -O3"
 OpenBSD:
 	@@make asm_out
@@@@ -1463,6 +1463,8 @@@@
 BeOS:
 	@@make $(DEFINES) CC=mwcc AR="mwcc -xml -o" SLD="mwcc -xms -f crypt.exp"
 
+all:
+	@@make default
 
 #****************************************************************************
 #*																			*
@


1.1
log
@Add cryptlib 3.1, a powerful security programming toolkit.

PR:		53397
Submitted by:	me
@
text
@@

