X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fgssd%2FMakefile.am;h=2365704c5db9b15d17f42b75adcb17f07f7e216f;hp=d152525daf5ef6fbfcbfd2e37471b96fe459c23e;hb=adee9b7bddedcddb8de4e0b7c2f778148b1f4d2b;hpb=43e5f4e81d522a5355ff9f88c8c4ced0087c754c

diff --git a/utils/gssd/Makefile.am b/utils/gssd/Makefile.am
index d152525..2365704 100644
--- a/utils/gssd/Makefile.am
+++ b/utils/gssd/Makefile.am
@@ -16,7 +16,7 @@ COMMON_SRCS = \
 	context.c \
 	context_mit.c \
 	context_heimdal.c \
-	context_spkm3.c \
+	context_lucid.c \
 	gss_util.c \
 	gss_oids.c \
 	err_util.c \
@@ -37,38 +37,39 @@ 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) $(LIBTIRPC)
 
-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 \
+	svcgssd_krb5.c \
 	\
-	cacheio.h \
+	svcgssd_krb5.h \
 	svcgssd.h
 
 svcgssd_LDADD = \
 	../../support/nfs/libnfs.a \
-	$(RPCSECGSS_LIBS) -lnfsidmap \
-	$(KRBLIBS)
+	$(RPCSECGSS_LIBS) $(GSSGLUE_LIBS) $(LIBNFSIDMAP) \
+	$(KRBLIBS) $(LIBTIRPC)
 
-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
 
 #######################################################################