LU-15956 gss: allow build without ssk

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

diff --git a/lustre/utils/gss/Makefile.am b/lustre/utils/gss/Makefile.am
index e89ce96..5798389 100644 (file)
--- a/lustre/utils/gss/Makefile.am
+++ b/lustre/utils/gss/Makefile.am
@@ -1,14 +1,13 @@
 # GSS daemons & tools Makefile
 
 AM_CFLAGS := -fPIC \
-            -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DLUSTRE_UTILS=1
+            -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DLUSTRE_UTILS=1 \
+            -D_GNU_SOURCE
 
-LIBCFS := $(top_builddir)/libcfs/libcfs/libcfs.a
-
-sbin_PROGRAMS = lsvcgssd l_idmap
+sbin_PROGRAMS = l_idmap
 
 if GSS_KEYRING
-sbin_PROGRAMS += lgss_keyring
+sbin_PROGRAMS += lsvcgssd lgss_keyring
 if GSS_SSK
 sbin_PROGRAMS += lgss_sk
 endif
@@ -33,11 +32,10 @@ COMMON_SRCS = \
         err_util.h \
         gss_oids.h \
         gss_util.h \
-        sk_utils.h \
         lsupport.h
 
 if GSS_SSK
-COMMON_SRCS += sk_utils.c
+COMMON_SRCS += sk_utils.h sk_utils.c
 endif
 
 lgssd_SOURCES = \
@@ -62,14 +60,15 @@ 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) -lcrypto -lssl -lkeyutils -lm
+lsvcgssd_LDADD = $(top_builddir)/lustre/utils/liblustreapi.la $(GSSAPI_LIBS) $(KRBLIBS) -lkeyutils -lm
 lsvcgssd_LDFLAGS = $(KRBLDFLAGS)
-lsvcgssd_DEPENDENCIES = $(LIBCFS)
+if GSS_SSK
+lsvcgssd_LDADD += -lcrypto -lssl
+endif
 
 l_idmap_SOURCES = \
        l_idmap.c \
@@ -78,7 +77,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 \
@@ -97,12 +96,12 @@ lgss_keyring_SOURCES = \
        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_LDADD = $(top_builddir)/lustre/utils/liblustreapi.la $(GSSAPI_LIBS) $(KRBLIBS) -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_keyring_LDADD += -lcrypto -lssl
 
 lgss_sk_SOURCES = \
        lgss_sk.c \
@@ -111,9 +110,8 @@ lgss_sk_SOURCES = \
        sk_utils.h
 
 lgss_sk_CFLAGS = $(AM_CFLAGS) $(CFLAGS) $(KRBCFLAGS)
-lgss_sk_LDADD = $(LIBCFS) $(GSSAPI_LIBS) $(KRBLIBS) -lcrypto -lssl -lm -lkeyutils
+lgss_sk_LDADD = $(top_builddir)/lustre/utils/liblustreapi.la $(GSSAPI_LIBS) $(KRBLIBS) -lcrypto -lssl -lm -lkeyutils
 lgss_sk_LDFLAGS = $(KRBLDFLAGS)
-lgss_sk_DEPENDENCIES = $(LIBCFS)
 endif
 
 EXTRA_DIST =