LU-5541 build: move libcfs and liblustreapi over to libtool

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

diff --git a/lustre/utils/Makefile.am b/lustre/utils/Makefile.am
index 56aba33..3cccbf0 100644 (file)
--- a/lustre/utils/Makefile.am
+++ b/lustre/utils/Makefile.am
@@ -4,8 +4,6 @@ AM_CFLAGS  := -fPIC -D_GNU_SOURCE \
              -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DLUSTRE_UTILS=1
 AM_LDFLAGS := -L$(top_builddir)/lnet/utils
 
-LIBCFS := $(top_builddir)/libcfs/libcfs/libcfs.a
-
 if TESTS
 EXTRA_PROGRAMS = wirecheck
 endif
@@ -13,7 +11,7 @@ endif
 if UTILS
 
 if GSS
-SUBDIRS = gss
+SUBDIRS = . gss
 GSSSRC = gss/err_util.c gss/err_util.h
 if GSS_SSK
 GSSSRC += gss/sk_utils.c gss/sk_utils.h
@@ -43,31 +41,34 @@ if LIBPTHREAD
 sbin_PROGRAMS += lhsmtool_posix
 endif
 
-pkglib_LTLIBRARIES =
-lib_LIBRARIES = liblustreapi.a
+lib_LIBRARIES =
+noinst_LIBRARIES =
 if LDISKFS_ENABLED
+libiam_a_SOURCES = libiam.c
 lib_LIBRARIES += libiam.a
 endif
-noinst_LIBRARIES = liblustreapitmp.a
+
+pkglib_LTLIBRARIES =
+lib_LTLIBRARIES = liblustreapi.la
 endif # UTILS
 
 lctl_SOURCES = portals.c debug.c obd.c lustre_cfg.c lctl.c obdctl.h
 if SERVER
 lctl_SOURCES += lustre_lfsck.c lsnapshot.c
 endif
-lctl_LDADD :=  liblustreapi.a $(LIBCFS) $(LIBREADLINE) $(PTHREAD_LIBS)
-lctl_DEPENDENCIES := $(LIBCFS) liblustreapi.a
+lctl_LDADD :=  liblustreapi.la $(PTHREAD_LIBS)
+lctl_DEPENDENCIES := liblustreapi.la
 
 lfs_SOURCES = lfs.c lfs_project.c lfs_project.h
-lfs_LDADD := liblustreapi.a $(LIBCFS) $(LIBREADLINE)
-lfs_DEPENDENCIES := $(LIBCFS) liblustreapi.a
+lfs_LDADD := liblustreapi.la
+lfs_DEPENDENCIES := liblustreapi.la
 
 lustre_rsync_SOURCES = lustre_rsync.c lustre_rsync.h
-lustre_rsync_LDADD :=  liblustreapi.a $(LIBCFS) $(LIBREADLINE) $(PTHREAD_LIBS)
-lustre_rsync_DEPENDENCIES := $(LIBCFS) liblustreapi.a
+lustre_rsync_LDADD :=  liblustreapi.la $(PTHREAD_LIBS)
+lustre_rsync_DEPENDENCIES := liblustreapi.la
 
 lshowmount_SOURCES = lshowmount.c nidlist.c nidlist.h
-lshowmount_LDADD :=  liblustreapi.a
+lshowmount_LDADD :=  liblustreapi.la
 
 if EXT2FS_DEVEL
 EXT2FSLIB = -lext2fs
@@ -87,17 +88,18 @@ llverfs_LDADD := $(EXT2FSLIB) $(E2PLIB)
 
 llverdev_LDADD := $(EXT2FSLIB) $(BLKIDLIB)
 
-liblustreapitmp_a_SOURCES = liblustreapi.c liblustreapi_hsm.c \
-                           liblustreapi_nodemap.c lustreapi_internal.h \
-                           liblustreapi_json.c liblustreapi_layout.c \
-                           liblustreapi_lease.c liblustreapi_util.c \
-                           liblustreapi_kernelconn.c liblustreapi_param.c \
-                           liblustreapi_mirror.c \
-                           $(top_builddir)/libcfs/libcfs/util/string.c \
-                           $(top_builddir)/libcfs/libcfs/util/param.c \
-                           liblustreapi_ladvise.c liblustreapi_chlg.c
+liblustreapi_la_SOURCES = liblustreapi.c liblustreapi_hsm.c \
+                         liblustreapi_nodemap.c lustreapi_internal.h \
+                         liblustreapi_json.c liblustreapi_layout.c \
+                         liblustreapi_lease.c liblustreapi_util.c \
+                         liblustreapi_kernelconn.c liblustreapi_param.c \
+                         liblustreapi_mirror.c \
+                         liblustreapi_ladvise.c liblustreapi_chlg.c
+liblustreapi_la_LDFLAGS = $(LIBREADLINE) -version-info 1:0:0
+liblustreapi_la_LIBADD = $(top_builddir)/libcfs/libcfs/libcfs.la
+
 if UTILS
-LIB_TARGETS = liblustreapi.so
+LIB_TARGETS =
 if PLUGINS
 if LDISKFS_ENABLED
 LIB_TARGETS += mount_osd_ldiskfs.so
@@ -107,12 +109,6 @@ LIB_TARGETS += mount_osd_zfs.so
 endif
 endif
 
-# build static and shared lib lustreapi
-liblustreapi.a : liblustreapitmp.a
-       rm -f liblustreapi.a liblustreapi.so
-       $(CC) $(LDFLAGS) -shared -o liblustreapi.so `$(AR) -t liblustreapitmp.a`
-       mv liblustreapitmp.a liblustreapi.a
-
 install-exec-hook:
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(libdir)
@@ -120,29 +116,18 @@ install-exec-hook:
        for p in $(LIB_TARGETS); do \
          if test -f $$p; then \
            f="`echo $$p | sed -e 's|^.*/||'`"; \
-           if `echo -n $$p | grep -q mount`; then \
-               echo " $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/lustre/$$f"; \
-               $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/lustre/$$f; \
-           else \
-               echo " $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$f"; \
-               $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$f; \
-           fi; \
+           echo " $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/lustre/$$f"; \
+           $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/lustre/$$f; \
          else :; fi; \
        done
 endif # UTILS
 
-if LDISKFS_ENABLED
-libiam_a_SOURCES = libiam.c
-endif
-
 llog_reader_SOURCES = llog_reader.c
-llog_reader_LDADD := $(LIBCFS) liblustreapi.a
-llog_reader_DEPENDENCIES := $(LIBCFS) liblustreapi.a
+llog_reader_LDADD := liblustreapi.la
+llog_reader_DEPENDENCIES := liblustreapi.la
 
 lr_reader_SOURCES = lr_reader.c
 
-lib_LTLIBRARIES =
-
 if UTILS
 
 PLUGIN_LIB =
@@ -189,7 +174,8 @@ endif # LDISKFS_ENABLED
 mount_lustre_SOURCES = mount_lustre.c mount_utils.c mount_utils.h $(GSSSRC)
 mount_lustre_CPPFLAGS := ${MNTMODCFLAGS}
 mount_lustre_LDFLAGS  := ${MNTMODLDFLAGS}
-mount_lustre_LDADD    := $(LIBCFS) $(SELINUX) $(LDLIBMOUNT) $(PLUGIN_LIB) $(GSSLIB)
+mount_lustre_LDADD    := $(top_builddir)/libcfs/libcfs/libcfs.la \
+                        $(SELINUX) $(LDLIBMOUNT) $(PLUGIN_LIB) $(GSSLIB)
 
 mkfs_lustre_SOURCES = mkfs_lustre.c mount_utils.c mount_utils.h $(GSSSRC)
 mkfs_lustre_CPPFLAGS := -UTUNEFS ${MNTMODCFLAGS}
@@ -202,12 +188,12 @@ tunefs_lustre_LDFLAGS  := ${MNTMODLDFLAGS}
 tunefs_lustre_LDADD    := $(mkfs_lustre_LDADD)
 
 l_getidentity_SOURCES = l_getidentity.c
-l_getidentity_LDADD := $(LIBCFS)
-l_getidentity_DEPENDENCIES := $(LIBCFS)
+l_getidentity_LDADD := liblustreapi.la
+l_getidentity_DEPENDENCIES := liblustreapi.la
 
 lhsmtool_posix_SOURCES = lhsmtool_posix.c
-lhsmtool_posix_LDADD := liblustreapi.a $(LIBCFS) $(PTHREAD_LIBS)
-lhsmtool_posix_DEPENDENCIES := liblustreapi.a $(LIBCFS)
+lhsmtool_posix_LDADD := liblustreapi.la $(PTHREAD_LIBS)
+lhsmtool_posix_DEPENDENCIES := liblustreapi.la
 
 wirecheck_SOURCES = wirecheck.c
 wirecheck_CPPFLAGS := -DCC="\"$(CC)\""