nfs-utils: clean up handling of libgssglue in gssd Makefile

[nfs-utils.git] / utils / gssd / Makefile.am

diff --git a/utils/gssd/Makefile.am b/utils/gssd/Makefile.am
index d1dfe51f58fb0eb60775a759c5aa567b7bf01134..95a2bd0f8c6cc21247d71549680b04a52f01772e 100644 (file)
--- a/utils/gssd/Makefile.am
+++ b/utils/gssd/Makefile.am
@@ -16,6 +16,7 @@ COMMON_SRCS = \
        context.c \
        context_mit.c \
        context_heimdal.c \
+       context_lucid.c \
        context_spkm3.c \
        gss_util.c \
        gss_oids.c \
@@ -37,37 +38,36 @@ gssd_SOURCES = \
        krb5_util.h \
        write_bytes.h
 
-gssd_LDADD = $(RPCSECGSS_LIBS) $(KRBLIBS)
-gssd_LDFLAGS = -Wl,-rpath=$(KRBDIR)/lib
+gssd_LDADD =   ../../support/nfs/libnfs.a \
+               $(RPCSECGSS_LIBS) $(GSSGLUE_LIBS) $(KRBLIBS)
+gssd_LDFLAGS = $(KRBLDFLAGS)
 
 gssd_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \
-             $(RPCSECGSS_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) $(KRBCFLAGS)
+                $(RPCSECGSS_CFLAGS) $(GSSGLUE_CFLAGS) $(KRBCFLAGS)
 
 MAINTAINERCLEANFILES = Makefile.in