X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fgss%2FMakefile.am;h=437a2e582b16ea720141ec85515ffafaa690b7f4;hb=b0797d7ed4e6551d229620b45295d9387b3202bd;hp=180b98fe5826c20f9798649819ea9568476a960b;hpb=adde80ffefe375e113c0e4a2a5f8e37519205b5c;p=fs%2Flustre-release.git

diff --git a/lustre/utils/gss/Makefile.am b/lustre/utils/gss/Makefile.am
index 180b98f..437a2e5 100644
--- a/lustre/utils/gss/Makefile.am
+++ b/lustre/utils/gss/Makefile.am
@@ -1,17 +1,17 @@
 # GSS daemons & tools Makefile
 
-SUBDIRS =
+AM_CFLAGS := -fPIC \
+	     -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DLUSTRE_UTILS=1 \
+	     -D_GNU_SOURCE
+AM_LDFLAGS := -no-install
 
-AM_CFLAGS=$(LLCFLAGS)
-AM_CPPFLAGS=$(LLCPPFLAGS) -DLUSTRE_UTILS=1
-AM_LDFLAGS := -L$(top_builddir)/libcfs/libcfs
-
-LIBCFS := $(top_builddir)/libcfs/libcfs/libcfs.a $(top_builddir)/libcfs/libcfs/libcfsutil.a
-
-sbin_PROGRAMS := lsvcgssd l_idmap
+sbin_PROGRAMS = lsvcgssd l_idmap
 
 if GSS_KEYRING
 sbin_PROGRAMS += lgss_keyring
+if GSS_SSK
+sbin_PROGRAMS += lgss_sk
+endif
 endif
 
 if GSS_PIPEFS
@@ -33,8 +33,13 @@ COMMON_SRCS = \
         err_util.h \
         gss_oids.h \
         gss_util.h \
+        sk_utils.h \
         lsupport.h
 
+if GSS_SSK
+COMMON_SRCS += sk_utils.c
+endif
+
 lgssd_SOURCES = \
         $(COMMON_SRCS) \
         gssd.c \
@@ -57,14 +62,12 @@ lsvcgssd_SOURCES = \
         svcgssd_main_loop.c \
         svcgssd_mech2file.c \
         svcgssd_proc.c \
-        \
         cacheio.h \
         svcgssd.h
 
 lsvcgssd_CFLAGS = $(AM_CFLAGS) $(CFLAGS) $(KRBCFLAGS)
-lsvcgssd_LDADD = $(LIBCFS) $(GSSAPI_LIBS) $(KRBLIBS)
+lsvcgssd_LDADD = $(top_builddir)/lustre/utils/liblustreapi.la $(GSSAPI_LIBS) $(KRBLIBS) -lcrypto -lssl -lkeyutils -lm
 lsvcgssd_LDFLAGS = $(KRBLDFLAGS)
-lsvcgssd_DEPENDENCIES = $(LIBCFS)
 
 l_idmap_SOURCES = \
 	l_idmap.c \
@@ -73,7 +76,7 @@ l_idmap_SOURCES = \
 	\
 	lsupport.h
 
-l_idmap_LDADD = $(LIBCFS)
+l_idmap_LDADD = $(top_builddir)/lustre/utils/liblustreapi.la
 
 lgss_keyring_SOURCES = \
 	lgss_keyring.c \
@@ -82,16 +85,31 @@ lgss_keyring_SOURCES = \
 	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) -lkeyutils $(GSSAPI_LIBS) $(KRBLIBS)
+lgss_keyring_LDADD = $(top_builddir)/lustre/utils/liblustreapi.la $(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 = $(top_builddir)/lustre/utils/liblustreapi.la $(GSSAPI_LIBS) $(KRBLIBS) -lcrypto -lssl -lm -lkeyutils
+lgss_sk_LDFLAGS = $(KRBLDFLAGS)
+endif
 
 EXTRA_DIST =