Index: /branches/rel_ag_9_4_5/swssl/crypto/crypto_app/Makefile
===================================================================
--- /branches/rel_ag_9_4_5/swssl/crypto/crypto_app/Makefile	(revision 20412)
+++ /branches/rel_ag_9_4_5/swssl/crypto/crypto_app/Makefile	(working copy)
@@ -1,5 +1,5 @@
 TOP=../../..
-include $(TOP)/Makefile.master
+include $(TOP)/Makefile.master $(TOP)/Makefile.kernel
 
 .if ! defined (NODEBUG)
 DEBUG_FLAGS= -g -fstack-protector-all -DDEBUG -DCLICKTCP
@@ -9,9 +9,9 @@
 
 CFLAGS = $(DEBUG_FLAGS)
 
-SDIRS = 
+SDIRS =
 
-CFLAGS += -DCLICK -DNOPADDING -DHISPEED_KDF -pipe -Wall -Werror 
+CFLAGS += -DCLICK -DNOPADDING -DHISPEED_KDF -pipe -Wall -Werror
 
 CINCLUDES = $(INCLUDE) -I. \
  -I$(TOP)/swssl/ssl_app \
@@ -24,7 +24,7 @@
  -I/usr/local/include \
  -I$(TOP)/FreeBSD/src/sys \
  -I$(TOP)/uproxy/utils/alwayson_logging/lib \
- -I$(TOP)/ssl/openssl/include/openssl 
+ -I$(TOP)/ssl/openssl/include/openssl
 
 TARGET = libcrypto_app.a
 
@@ -36,18 +36,18 @@
 	eccdh.o \
 	ecsm2.o \
 	key_agreement.o \
- 	sm4ipp.o \
- 	sm3ipp.o \
- 	sm2ipp.o \
- 	sm2ipp_click.o \
+  sm4ipp.o \
+  sm3ipp.o \
+  sm2ipp.o \
+  sm2ipp_click.o \
 	ecdsa_click.o \
 	message_digest.o \
 	crypto_process.o
 
-.if ! defined (NODEBUG)
-OBJS += $(TOP)/FreeBSD/src/sys/compile/SERVER/ssl3_ciphers.o
-.else
+.if ! defined $(CLICK_KERNEL_CONFIG)
 OBJS += $(TOP)/FreeBSD/src/sys/compile/CA1000/ssl3_ciphers.o
+.else
+OBJS += $(TOP)/FreeBSD/src/sys/compile/$(CLICK_KERNEL_CONFIG)/ssl3_ciphers.o
 .endif
 
 CFILE=$(OBJS:%.o=%.c)
Index: /branches/rel_ag_9_4_5/swssl/ssl_app/Makefile
===================================================================
--- /branches/rel_ag_9_4_5/swssl/ssl_app/Makefile	(revision 20412)
+++ /branches/rel_ag_9_4_5/swssl/ssl_app/Makefile	(working copy)
@@ -1,5 +1,5 @@
 TOP=../..
-include $(TOP)/Makefile.master
+include $(TOP)/Makefile.master $(TOP)/Makefile.kernel
 
 .if ! defined (NODEBUG)
 DEBUG_FLAGS= -g -fstack-protector-all -DDEBUG -DCLICKTCP
@@ -9,10 +9,10 @@
 
 CFLAGS = $(DEBUG_FLAGS)
 
-SDIRS = 
+SDIRS =
 
 .if ! defined (TRANSP)
-TRANSP_FLAGS= 
+TRANSP_FLAGS=
 .else
 TRANSP_FLAGS= -DTRANSP
 .endif
@@ -37,10 +37,10 @@
    ssl_gen_random_bytes.o \
    ssl_crypto_common.o
 
-.if ! defined (NODEBUG)
-OBJS += $(TOP)/FreeBSD/src/sys/compile/SERVER/ssl3_ciphers.o
-.else
+.if ! defined $(CLICK_KERNEL_CONFIG)
 OBJS += $(TOP)/FreeBSD/src/sys/compile/CA1000/ssl3_ciphers.o
+.else
+OBJS += $(TOP)/FreeBSD/src/sys/compile/$(CLICK_KERNEL_CONFIG)/ssl3_ciphers.o
 .endif
 
 CFILE=$(OBJS:%.o=%.c)
Index: /branches/rel_ag_9_4_5/swssl/ssl_offload/Makefile
===================================================================
--- /branches/rel_ag_9_4_5/swssl/ssl_offload/Makefile	(revision 20412)
+++ /branches/rel_ag_9_4_5/swssl/ssl_offload/Makefile	(working copy)
@@ -1,5 +1,5 @@
 TOP=../..
-include $(TOP)/Makefile.master
+include $(TOP)/Makefile.master $(TOP)/Makefile.kernel
 
 .if ! defined (NODEBUG)
 DEBUG_FLAGS= -g -fstack-protector-all -DDEBUG -DCLICKTCP
@@ -9,10 +9,10 @@
 
 CFLAGS = $(DEBUG_FLAGS)
 
-SDIRS = 
+SDIRS =
 
 .if ! defined (TRANSP)
-TRANSP_FLAGS= 
+TRANSP_FLAGS=
 .else
 TRANSP_FLAGS= -DTRANSP
 .endif
@@ -32,7 +32,7 @@
 -Wl,-rpath,/ca/lib \
 -L$(TOP)/ssl/openssl \
 -lcrypto -lssl \
--lc -lm 
+-lc -lm
 
 
 LIBS = $(TOP)/objdir/libmuxconnapi.a \
@@ -49,10 +49,10 @@
 
 OBJS = ssl_offload.o
 
-.if ! defined (NODEBUG)
-OBJS += $(TOP)/FreeBSD/src/sys/compile/SERVER/ssl3_ciphers.o
-.else
+.if ! defined $(CLICK_KERNEL_CONFIG)
 OBJS += $(TOP)/FreeBSD/src/sys/compile/CA1000/ssl3_ciphers.o
+.else
+OBJS += $(TOP)/FreeBSD/src/sys/compile/$(CLICK_KERNEL_CONFIG)/ssl3_ciphers.o
 .endif
 
 CFILE=$(OBJS:%.o=%.c)