--- appl/test/Makefile.in.orig	2017-06-10 19:27:47 UTC
+++ appl/test/Makefile.in
@@ -170,11 +170,15 @@ am_gssapi_server_OBJECTS = gssapi_server
 	gss_common.$(OBJEXT) common.$(OBJEXT)
 gssapi_server_OBJECTS = $(am_gssapi_server_OBJECTS)
 gssapi_server_DEPENDENCIES = $(top_builddir)/lib/gssapi/libgssapi.la \
+	$(LIB_heimbase) \
+	$(top_builddir)/lib/hx509/libhx509.la \
 	$(am__DEPENDENCIES_2)
 am_http_client_OBJECTS = http_client.$(OBJEXT) gss_common.$(OBJEXT) \
 	common.$(OBJEXT)
 http_client_OBJECTS = $(am_http_client_OBJECTS)
 http_client_DEPENDENCIES = $(top_builddir)/lib/gssapi/libgssapi.la \
+	$(LIB_heimbase) \
+	$(top_builddir)/lib/hx509/libhx509.la \
 	$(am__DEPENDENCIES_2)
 am_nt_gss_client_OBJECTS = nt_gss_client.$(OBJEXT) \
 	nt_gss_common.$(OBJEXT) common.$(OBJEXT)
@@ -187,26 +191,42 @@ am__DEPENDENCIES_4 = $(am__DEPENDENCIES_
 nt_gss_server_DEPENDENCIES = $(am__DEPENDENCIES_4)
 am_tcp_client_OBJECTS = tcp_client.$(OBJEXT) common.$(OBJEXT)
 tcp_client_OBJECTS = $(am_tcp_client_OBJECTS)
-tcp_client_LDADD = $(LDADD)
+tcp_client_LDADD = $(LDADD) \
+	$(LIB_heimbase) \
+	$(top_builddir)/lib/hx509/libhx509.la
 tcp_client_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
+	$(LIB_heimbase) \
+	$(top_builddir)/lib/hx509/libhx509.la \
 	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
 	$(am__DEPENDENCIES_1)
 am_tcp_server_OBJECTS = tcp_server.$(OBJEXT) common.$(OBJEXT)
 tcp_server_OBJECTS = $(am_tcp_server_OBJECTS)
-tcp_server_LDADD = $(LDADD)
+tcp_server_LDADD = $(LDADD) \
+	$(LIB_heimbase) \
+	$(top_builddir)/lib/hx509/libhx509.la
 tcp_server_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
+	$(LIB_heimbase) \
+	$(top_builddir)/lib/hx509/libhx509.la \
 	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
 	$(am__DEPENDENCIES_1)
 am_uu_client_OBJECTS = uu_client.$(OBJEXT) common.$(OBJEXT)
 uu_client_OBJECTS = $(am_uu_client_OBJECTS)
-uu_client_LDADD = $(LDADD)
+uu_client_LDADD = $(LDADD) \
+	$(LIB_heimbase) \
+	$(top_builddir)/lib/hx509/libhx509.la
 uu_client_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
+	$(LIB_heimbase) \
+	$(top_builddir)/lib/hx509/libhx509.la \
 	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
 	$(am__DEPENDENCIES_1)
 am_uu_server_OBJECTS = uu_server.$(OBJEXT) common.$(OBJEXT)
 uu_server_OBJECTS = $(am_uu_server_OBJECTS)
-uu_server_LDADD = $(LDADD)
+uu_server_LDADD = $(LDADD) \
+	$(LIB_heimbase) \
+	$(top_builddir)/lib/hx509/libhx509.la
 uu_server_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
+	$(LIB_heimbase) \
+	$(top_builddir)/lib/hx509/libhx509.la \
 	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
 	$(am__DEPENDENCIES_1)
 AM_V_P = $(am__v_P_@AM_V@)
@@ -546,9 +566,13 @@ http_client_SOURCES = http_client.c gss_
 
 uu_server_SOURCES = uu_server.c common.c test_locl.h
 uu_client_SOURCES = uu_client.c common.c test_locl.h
-gssapi_server_LDADD = $(top_builddir)/lib/gssapi/libgssapi.la $(LDADD)
+gssapi_server_LDADD = $(top_builddir)/lib/gssapi/libgssapi.la $(LDADD) \
+	$(LIB_heimbase) \
+	$(top_builddir)/lib/hx509/libhx509.la
 gssapi_client_LDADD = $(gssapi_server_LDADD)
-http_client_LDADD = $(top_builddir)/lib/gssapi/libgssapi.la $(LDADD)
+http_client_LDADD = $(top_builddir)/lib/gssapi/libgssapi.la $(LDADD) \
+	$(LIB_heimbase) \
+	$(top_builddir)/lib/hx509/libhx509.la
 nt_gss_client_SOURCES = nt_gss_client.c nt_gss_common.c nt_gss_common.h common.c
 nt_gss_server_SOURCES = nt_gss_server.c nt_gss_common.c nt_gss_common.h
 nt_gss_client_LDADD = $(gssapi_server_LDADD)