X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fgss%2FMakefile.am;h=5bac807ef39738dd2793652f043697532ef456de;hb=2ffbcc9f9ad930fee2df53238b3244b7c3e6bb91;hp=01ee650c7b7dc692daf3dcc8f3e63f4aecbfe98e;hpb=d2d56f38da01001c92a09afc6b52b5acbd9bc13c;p=fs%2Flustre-release.git

diff --git a/lustre/utils/gss/Makefile.am b/lustre/utils/gss/Makefile.am
index 01ee650..5bac807 100644
--- a/lustre/utils/gss/Makefile.am
+++ b/lustre/utils/gss/Makefile.am
@@ -1,14 +1,23 @@
-# gss daemons Makefile
+# GSS daemons & tools Makefile
 
-SUBDIRS =
+AM_CFLAGS := -fPIC \
+	     -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DLUSTRE_UTILS=1 \
+	     -D_GNU_SOURCE
 
-AM_CFLAGS=$(LLCFLAGS)
-AM_CPPFLAGS=$(LLCPPFLAGS) -DLUSTRE_UTILS=1
-AM_LDFLAGS := -L$(top_builddir)/lnet/utils
+LIBCFS := $(top_builddir)/libcfs/libcfs/libcfs.a
 
-LIBPTLCTL := $(top_builddir)/lnet/utils/libptlctl.a
+sbin_PROGRAMS = lsvcgssd l_idmap
 
-sbin_PROGRAMS = lgssd lsvcgssd l_idmap
+if GSS_KEYRING
+sbin_PROGRAMS += lgss_keyring
+if GSS_SSK
+sbin_PROGRAMS += lgss_sk
+endif
+endif
+
+if GSS_PIPEFS
+sbin_PROGRAMS += lgssd
+endif
 
 COMMON_SRCS = \
         context.c \
@@ -25,7 +34,12 @@ COMMON_SRCS = \
         err_util.h \
         gss_oids.h \
         gss_util.h \
-	lsupport.h
+        sk_utils.h \
+        lsupport.h
+
+if GSS_SSK
+COMMON_SRCS += sk_utils.c
+endif
 
 lgssd_SOURCES = \
         $(COMMON_SRCS) \
@@ -38,9 +52,9 @@ lgssd_SOURCES = \
         krb5_util.h \
         write_bytes.h
 
-lgssd_LDADD = $(GSSAPI_LIBS) $(KRBLIBS)
-lgssd_LDFLAGS = $(KRBLDFLAGS)
 lgssd_CFLAGS = $(AM_CFLAGS) $(CFLAGS) $(KRBCFLAGS)
+lgssd_LDADD =  $(GSSAPI_LIBS) $(KRBLIBS)
+lgssd_LDFLAGS = $(KRBLDFLAGS)
 
 lsvcgssd_SOURCES = \
         $(COMMON_SRCS) \
@@ -53,9 +67,10 @@ lsvcgssd_SOURCES = \
         cacheio.h \
         svcgssd.h
 
-lsvcgssd_LDADD = $(GSSAPI_LIBS) $(KRBLIBS)
-lsvcgssd_LDFLAGS = $(KRBLDFLAGS)
 lsvcgssd_CFLAGS = $(AM_CFLAGS) $(CFLAGS) $(KRBCFLAGS)
+lsvcgssd_LDADD = $(LIBCFS) $(GSSAPI_LIBS) $(KRBLIBS) -lcrypto -lssl -lkeyutils -lm
+lsvcgssd_LDFLAGS = $(KRBLDFLAGS)
+lsvcgssd_DEPENDENCIES = $(LIBCFS)
 
 l_idmap_SOURCES = \
 	l_idmap.c \
@@ -64,4 +79,42 @@ l_idmap_SOURCES = \
 	\
 	lsupport.h
 
+l_idmap_LDADD = $(LIBCFS)
+
+lgss_keyring_SOURCES = \
+	lgss_keyring.c \
+	context.c \
+	context_lucid.c \
+	context_mit.c \
+	context_heimdal.c \
+	lgss_krb5_utils.c \
+	lgss_null_utils.c \
+	lgss_utils.c \
+	lsupport.c \
+	err_util.c \
+	lgss_krb5_utils.h \
+	lgss_utils.h \
+	err_util.h \
+	lsupport.h
+
+lgss_keyring_CFLAGS = $(AM_CFLAGS) $(CFLAGS) $(KRBCFLAGS) -D _NEW_BUILD_
+lgss_keyring_LDADD = $(LIBCFS) $(GSSAPI_LIBS) $(KRBLIBS) -lcrypto -lssl -lm -lkeyutils
+lgss_keyring_LDFLAGS = $(KRBLDFLAGS)
+lgss_keyring_DEPENDENCIES = $(LIBCFS)
+
+if GSS_SSK
+lgss_keyring_SOURCES += sk_utils.c sk_utils.h lgss_sk_utils.c
+
+lgss_sk_SOURCES = \
+	lgss_sk.c \
+	err_util.c \
+	sk_utils.c \
+	sk_utils.h
+
+lgss_sk_CFLAGS = $(AM_CFLAGS) $(CFLAGS) $(KRBCFLAGS)
+lgss_sk_LDADD = $(LIBCFS) $(GSSAPI_LIBS) $(KRBLIBS) -lcrypto -lssl -lm -lkeyutils
+lgss_sk_LDFLAGS = $(KRBLDFLAGS)
+lgss_sk_DEPENDENCIES = $(LIBCFS)
+endif
+
 EXTRA_DIST =