LU-1735 ptlrpc: only set jobid if not already set

[fs/lustre-release.git] / lustre / utils / gss / Makefile.am

diff --git a/lustre/utils/gss/Makefile.am b/lustre/utils/gss/Makefile.am
index 01ee650..fdf2acc 100644 (file)
--- a/lustre/utils/gss/Makefile.am
+++ b/lustre/utils/gss/Makefile.am
@@ -1,14 +1,22 @@
-# gss daemons Makefile
+# GSS daemons & tools Makefile
 
 SUBDIRS =
 
 AM_CFLAGS=$(LLCFLAGS)
 AM_CPPFLAGS=$(LLCPPFLAGS) -DLUSTRE_UTILS=1
-AM_LDFLAGS := -L$(top_builddir)/lnet/utils
+AM_LDFLAGS := -L$(top_builddir)/libcfs/libcfs
 
-LIBPTLCTL := $(top_builddir)/lnet/utils/libptlctl.a
+LIBCFS := $(top_builddir)/libcfs/libcfs/libcfs.a $(top_builddir)/libcfs/libcfs/libcfsutil.a
 
-sbin_PROGRAMS = lgssd lsvcgssd l_idmap
+sbin_PROGRAMS = lsvcgssd l_idmap
+
+if GSS_KEYRING
+sbin_PROGRAMS += lgss_keyring
+endif
+
+if GSS_PIPEFS
+sbin_PROGRAMS += lgssd
+endif
 
 COMMON_SRCS = \
         context.c \
@@ -25,7 +33,7 @@ COMMON_SRCS = \
         err_util.h \
         gss_oids.h \
         gss_util.h \
-       lsupport.h
+        lsupport.h
 
 lgssd_SOURCES = \
         $(COMMON_SRCS) \
@@ -38,9 +46,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 +61,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)
+lsvcgssd_LDFLAGS = $(KRBLDFLAGS)
+lsvcgssd_DEPENDENCIES = $(LIBCFS)
 
 l_idmap_SOURCES = \
        l_idmap.c \
@@ -64,4 +73,25 @@ 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_utils.c \
+       lsupport.c \
+       \
+       lgss_krb5_utils.h \
+       lgss_utils.h \
+       lsupport.h
+
+lgss_keyring_CFLAGS = $(AM_CFLAGS) $(CFLAGS) $(KRBCFLAGS) -D _NEW_BUILD_
+lgss_keyring_LDADD = $(LIBCFS) -lkeyutils $(GSSAPI_LIBS) $(KRBLIBS)
+lgss_keyring_LDFLAGS = $(KRBLDFLAGS)
+lgss_keyring_DEPENDENCIES = $(LIBCFS)
+
 EXTRA_DIST =