./Makefile: Merge with EOM 1.48

Let's get aggressive!

Comments are not good at the end of an assignment line

Make PF_ENCAP and PF_KEY versions of OpenBSD support separated through the OS
make variable of the top Makefile.

Add commented out usages of Boehm's GC library

LDADD and DPADD should be appended to. 1999 (c). Style.

1 files changed, 25 insertions, 16 deletions

diff --git a/sbin/isakmpd/Makefile b/sbin/isakmpd/Makefile
index ee1280d2b92..00693d177b9 100644
--- a/sbin/isakmpd/Makefile
+++ b/sbin/isakmpd/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.12 1999/03/24 16:01:24 niklas Exp $
-#	$EOM: Makefile,v 1.43 1999/03/02 14:27:47 niklas Exp $
+#	$OpenBSD: Makefile,v 1.13 1999/04/19 21:00:19 niklas Exp $
+#	$EOM: Makefile,v 1.48 1999/04/16 21:24:46 niklas Exp $
 
 #
-# Copyright (c) 1998 Niklas Hallqvist.  All rights reserved.
+# Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -40,7 +40,10 @@
 # may provide this make variant as "pmake" or maybe "bsdmake".
 #
 
+# openbsd means 2.5 or newer, openbsd-encap is for older kernels with PF_ENCAP
+# linux is the name for Linux with FreeS/WAN integrated
 OS=		openbsd
+#OS=		openbsd-encap
 #OS=		linux
 
 .PATH:		${.CURDIR}/sysdep/${OS}
@@ -49,18 +52,14 @@ PROG=		isakmpd
 BINDIR?=	/sbin
 SRCS=		app.c asn.c asn_useful.c attribute.c cert.c constants.c \
 		conf.c cookie.c crypto.c dh.c doi.c exchange.c exchange_num.c \
-		field.c gmp_util.c hash.c if.c ike_auth.c ike_main_mode.c \
+		field.c gmp_util.c hash.c if.c ike_auth.c ike_aggressive.c \
+		ike_main_mode.c ike_phase_1.c \
 		ike_quick_mode.c init.c ipsec.c ipsec_fld.c ipsec_num.c \
 		isakmpd.c isakmp_doi.c isakmp_fld.c isakmp_num.c log.c \
 		message.c math_2n.c math_ec2n.c math_group.c \
 		pkcs.c prf.c sa.c sysdep.c timer.c transport.c udp.c ui.c \
 		util.c x509.c
 
-# Chose one of the IPSec SADB interfacing choices
-#SRCS+=		pf_encap.c
-SRCS+=		pf_key_v2.c
-#SRCS+=		klips.c
-
 GENERATED=	exchange_num.h ipsec_fld.h ipsec_num.h isakmp_fld.h \
 		isakmp_num.h
 CLEANFILES=	exchange_num.c exchange_num.h ipsec_num.c ipsec_num.h \
@@ -70,20 +69,30 @@ MAN=		isakmpd.8 isakmpd.conf.5
 CFLAGS+=	-Wall -DNEED_SYSDEP_APP \
 		-I${.CURDIR} -I${.CURDIR}/sysdep/${OS} -I. \
 
-#If you use PF_KEYv2 do this:
-CFLAGS+=	-DUSE_PF_KEY_V2
-
 # Different debugging & profiling suggestions
-#
+
 # Include symbolic debugging info
 DEBUG=		-g
-#
+
 # Do execution time profiles
 #CFLAGS+=	-pg
-#
+
 # If you have ElectricFence available, you can spot abuses of the heap.
+# (/usr/ports/devel/ElectricFence)
 #LDADD+=		-L/usr/local/lib -lefence
-#
+#DPADD+=		/usr/local/lib/libefence.a
+
+# If you like to use Boehm's garbage collector (/usr/ports/devel/boehm-gc).
+#LDADD+=		-L/usr/local/lib -lgc
+#DPADD+=		/usr/local/lib/libgc.a
+
+# You can also use Boehm's garbage collector as a means to find leaks.
+# XXX Expect warnings due to missing prototypes if using this though.
+#LDADD+=		-L/usr/local/lib -lleak
+#DPADD+=		/usr/local/lib/libleak.a
+#CFLAGS+=	-D'malloc(x)=GC_debug_malloc((x),__FILE__,__LINE__)' \
+#		-D'realloc(x,y)=GC_debug_realloc((x),(y),__FILE__,__LINE__)' \
+#		-D'free(x)=GC_debug_free(x)' -D'calloc(x,y)=malloc((x)*(y))'
 
 .if !make(install)
 SUBDIR=		regress