X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fgssd%2FMakefile.am;h=95a2bd0f8c6cc21247d71549680b04a52f01772e;hp=b29bf1af7b379c9c6aae3c83024729fa6a7569a2;hb=1a4bbe59d5cf0684c46b329fcc765eac97dab6ba;hpb=4fde9011946076918021a7007408b0d9802e80d0

diff --git a/utils/gssd/Makefile.am b/utils/gssd/Makefile.am
index b29bf1a..95a2bd0 100644
--- a/utils/gssd/Makefile.am
+++ b/utils/gssd/Makefile.am
@@ -14,7 +14,10 @@ EXTRA_DIST = \
 
 COMMON_SRCS = \
 	context.c \
+	context_mit.c \
 	context_heimdal.c \
+	context_lucid.c \
+	context_spkm3.c \
 	gss_util.c \
 	gss_oids.c \
 	err_util.c \
@@ -35,38 +38,37 @@ gssd_SOURCES = \
 	krb5_util.h \
 	write_bytes.h
 
-gssd_LDADD = -lrpcsecgss -lgssapi -ldl $(KRBLIBS)
-gssd_LDFLAGS = -Wl,-rpath=$(KRBDIR)/lib
+gssd_LDADD =	../../support/nfs/libnfs.a \
+		$(RPCSECGSS_LIBS) $(GSSGLUE_LIBS) $(KRBLIBS)
+gssd_LDFLAGS = $(KRBLDFLAGS)
 
-gssd_CPPFLAGS = -I$(top_srcdir)/support/rpc/include \
-	      $(AM_CPPFLAGS) $(CPPFLAGS)
-		
 gssd_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \
-	      $(KRBCFLAGS)
+	      $(RPCSECGSS_CFLAGS) $(GSSGLUE_CFLAGS) $(KRBCFLAGS)
 
 svcgssd_SOURCES = \
 	$(COMMON_SRCS) \
-	cacheio.c \
 	svcgssd.c \
 	svcgssd_main_loop.c \
 	svcgssd_mech2file.c \
 	svcgssd_proc.c \
 	\
-	cacheio.h \
 	svcgssd.h
 
 svcgssd_LDADD = \
 	../../support/nfs/libnfs.a \
-	$(RPCSECGSS_LIBS) -lnfsidmap \
+	$(RPCSECGSS_LIBS) $(GSSGLUE_LIBS) -lnfsidmap \
 	$(KRBLIBS)
 
-svcgssd_LDFLAGS = -Wl,-rpath=$(KRBDIR)/lib
+svcgssd_LDFLAGS = $(KRBLDFLAGS)
 
 svcgssd_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \
-		 $(RPCSECGSS_CFLAGS) $(KRBCFLAGS)
+		 $(RPCSECGSS_CFLAGS) $(GSSGLUE_CFLAGS) $(KRBCFLAGS)
 
 gss_clnt_send_err_SOURCES = gss_clnt_send_err.c
 
+gss_clnt_send_err_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \
+		 $(RPCSECGSS_CFLAGS) $(GSSGLUE_CFLAGS) $(KRBCFLAGS)
+
 MAINTAINERCLEANFILES = Makefile.in
 
 #######################################################################