X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Futils%2FMakefile.am;h=8704f5ba5fda8ba2514a960b42dab71d7a0475ab;hp=e0b6631bb844a6d1dd26db26495b3a429648d940;hb=510aea4a37ea26769be5946ca93a4576a1dd4095;hpb=11a138cb9d005ef0180421bd17542071b63e18d9

diff --git a/lustre/utils/Makefile.am b/lustre/utils/Makefile.am
index e0b6631..8704f5b 100644
--- a/lustre/utils/Makefile.am
+++ b/lustre/utils/Makefile.am
@@ -1,15 +1,8 @@
 # Administration utilities Makefile
 
 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
-
-MNTMODLDFLAGS := -rdynamic -ldl
-MNTMODCFLAGS := -DPLUGIN_DIR=\"${pkglibdir}\"
-
-LIBPTLCTL := $(top_builddir)/lnet/utils/libptlctl.a \
-	     $(top_builddir)/libcfs/libcfs/libcfsutil.a \
-	     $(top_builddir)/libcfs/libcfs/libcfs.a
+	      -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DLUSTRE_UTILS=1 $(UTILS_CFLAGS)
+AM_LDFLAGS := $(UTILS_LDFLAGS)
 
 if TESTS
 EXTRA_PROGRAMS = wirecheck
@@ -18,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
@@ -30,47 +23,63 @@ GSSLIB =
 endif
 
 # mount only finds helpers in /sbin
-rootsbin_PROGRAMS = mount.lustre
+rootsbin_PROGRAMS = mount.lustre mount.lustre_tgt
 bin_SCRIPTS   = llstat llobdstat plot-llstat
 bin_PROGRAMS  = lfs
 sbin_SCRIPTS  = ldlm_debug_upcall
-sbin_PROGRAMS = lctl l_getidentity llverfs lustre_rsync ll_decode_linkea
+sbin_PROGRAMS = lctl l_getidentity llverfs lustre_rsync ll_decode_linkea \
+		llsom_sync
 
 if TESTS
-bin_PROGRAMS  += req_layout
 sbin_PROGRAMS += wiretest
 endif # TESTS
 
 if SERVER
 sbin_PROGRAMS += mkfs.lustre tunefs.lustre llverdev lr_reader lshowmount \
-		 ll_decode_filter_fid llog_reader
+		 ll_decode_filter_fid llog_reader l_tunedisk
 endif
 if LIBPTHREAD
 sbin_PROGRAMS += lhsmtool_posix
 endif
 
-pkglib_LTLIBRARIES =
-lib_LIBRARIES = liblustreapi.a
+if SELINUX
+if GETSEPOL
+sbin_PROGRAMS += l_getsepol
+endif
+endif
+
+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 = lustre_lfsck.c obd.c lustre_cfg.c lctl.c obdctl.h
-lctl_LDADD :=  liblustreapi.a $(LIBPTLCTL) $(LIBREADLINE) $(PTHREAD_LIBS)
-lctl_DEPENDENCIES := $(LIBPTLCTL) liblustreapi.a
+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.la $(PTHREAD_LIBS) -lyaml
+lctl_DEPENDENCIES := liblustreapi.la
+
+lfs_SOURCES = lfs.c lfs_project.c lfs_project.h
+lfs_LDADD := liblustreapi.la -lz
+lfs_LDADD += $(top_builddir)/lnet/utils/lnetconfig/liblnetconfig.la
+lfs_DEPENDENCIES := liblustreapi.la
 
-lfs_SOURCES = lfs.c
-lfs_LDADD := liblustreapi.a $(LIBPTLCTL) $(LIBREADLINE)
-lfs_DEPENDENCIES := $(LIBPTLCTL) liblustreapi.a
+lustre_rsync_SOURCES = lustre_rsync.c lustre_rsync.h callvpe.c callvpe.h
+lustre_rsync_LDADD :=  liblustreapi.la $(PTHREAD_LIBS)
+lustre_rsync_DEPENDENCIES := liblustreapi.la
 
-lustre_rsync_SOURCES = lustre_rsync.c obd.c lustre_cfg.c lustre_rsync.h
-lustre_rsync_LDADD :=  liblustreapi.a $(LIBPTLCTL) $(LIBREADLINE) $(PTHREAD_LIBS)
-lustre_rsync_DEPENDENCIES := $(LIBPTLCTL) liblustreapi.a
+llsom_sync_LDADD := liblustreapi.la
+llsom_sync_DEPENDENCIES := liblustreapi.la
 
 lshowmount_SOURCES = lshowmount.c nidlist.c nidlist.h
-lshowmount_LDADD :=  liblustreapi.a
+lshowmount_LDADD :=  liblustreapi.la
 
 if EXT2FS_DEVEL
 EXT2FSLIB = -lext2fs
@@ -80,99 +89,133 @@ E2PLIB =
 EXT2FSLIB =
 endif
 
-if BLKID
-BLKIDLIB = -lblkid
-else
-BLKIDLIB =
-endif
-
 llverfs_LDADD := $(EXT2FSLIB) $(E2PLIB)
 
-llverdev_LDADD := $(EXT2FSLIB) $(BLKIDLIB)
+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_heat.c liblustreapi_pcc.c
+liblustreapi_la_LDFLAGS = $(LIBREADLINE) -version-info 1:0:0 \
+			  -Wl,--version-script=liblustreapi.map
+liblustreapi_la_LIBADD = $(top_builddir)/libcfs/libcfs/libcfs.la
 
-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 \
-			    $(top_builddir)/libcfs/libcfs/util/string.c \
-			    $(top_builddir)/libcfs/libcfs/util/param.c \
-			    liblustreapi_ladvise.c
 if UTILS
-# 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
+LIB_TARGETS =
+if PLUGINS
+if LDISKFS_ENABLED
+LIB_TARGETS += mount_osd_ldiskfs.so
+endif
+if ZFS_ENABLED
+LIB_TARGETS += mount_osd_zfs.so
+endif
+endif
 
-install-exec-hook: liblustreapi.so
+install-exec-hook:
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(libdir)
-	@list=$< ; for p in $$list; do \
+	$(mkinstalldirs) $(DESTDIR)$(libdir)/lustre
+	for p in $(LIB_TARGETS); do \
 	  if test -f $$p; then \
 	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$f"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$f; \
+	    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
-
-req_layout_SOURCES = req-layout.c
-
 llog_reader_SOURCES = llog_reader.c
-llog_reader_LDADD := $(LIBPTLCTL) liblustreapi.a
-llog_reader_DEPENDENCIES := $(LIBPTLCTL) liblustreapi.a
+llog_reader_LDADD := liblustreapi.la
+llog_reader_DEPENDENCIES := liblustreapi.la
 
 lr_reader_SOURCES = lr_reader.c
 
 if UTILS
 
-if ZFS_ENABLED
-pkglib_LTLIBRARIES += mount_osd_zfs.la
+PLUGIN_LIB =
+if PLUGINS
+MNTMODLDFLAGS := -rdynamic
+MNTMODLIBS := -ldl
+MNTMODCFLAGS := -DPLUGIN_DIR=\"${pkglibdir}\"
+endif # PLUGINS
 
-mount_osd_zfs_la_SOURCES = mount_utils_zfs.c
-mount_osd_zfs_la_CPPFLAGS := -DHAVE_IOCTL_IN_UNISTD_H $(ZFS_LIBZFS_INCLUDE)
-mount_osd_zfs_la_LDFLAGS  := -pthread $(ZFS_LIBZFS_LDFLAGS)
-mount_osd_zfs_la_LDFLAGS  += -shared -export-dynamic -module -avoid-version
+if ZFS_ENABLED
+noinst_LIBRARIES += libmount_utils_zfs.a
+
+libmount_utils_zfs_a_SOURCES = libmount_utils_zfs.c
+libmount_utils_zfs_a_CPPFLAGS := -DHAVE_IOCTL_IN_UNISTD_H $(ZFS_LIBZFS_INCLUDE)
+
+if PLUGINS
+lib_LTLIBRARIES += libmount_utils_zfs.la
+libmount_utils_zfs.la : libmount_utils_zfs.a
+	$(CC) $(LDFLAGS) $(MNTMODLDFLAGS) -shared -export-dynamic -pthread \
+			 $(ZFS_LIBZFS_LDFLAGS) -o mount_osd_zfs.so \
+			 `$(AR) -t libmount_utils_zfs.a` \
+			 $(MNTMODLIBS) $(ZFS_LIBZFS_LIBS)
+else
+MNTMODLDFLAGS := $(ZFS_LIBZFS_LDFLAGS)
+MNTMODLIBS := $(ZFS_LIBZFS_LIBS)
+PLUGIN_LIB += libmount_utils_zfs.a
+endif # PLUGINS
 endif # ZFS_ENABLED
 
 if LDISKFS_ENABLED
-pkglib_LTLIBRARIES += mount_osd_ldiskfs.la
-
-mount_osd_ldiskfs_la_SOURCES = mount_utils_ldiskfs.c
-mount_osd_ldiskfs_la_LDFLAGS  := -shared -export-dynamic -module -avoid-version
-mount_osd_ldiskfs_la_LIBADD   := $(SELINUX)
+noinst_LIBRARIES += libmount_utils_ldiskfs.a
+
+libmount_utils_ldiskfs_a_SOURCES = libmount_utils_ldiskfs.c
+libmount_utils_ldiskfs_a_CPPFLAGS := $(SELINUX)
+
+if PLUGINS
+lib_LTLIBRARIES += libmount_utils_ldiskfs.la
+libmount_utils_ldiskfs.la : libmount_utils_ldiskfs.a
+	$(CC) $(LDFLAGS) $(MNTMODLDFLAGS) -shared -export-dynamic \
+			 -o mount_osd_ldiskfs.so \
+			 `$(AR) -t libmount_utils_ldiskfs.a` \
+			 $(MNTMODLIBS) $(SELINUX)
+else
+PLUGIN_LIB += libmount_utils_ldiskfs.a
+endif # PLUGINS
 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    := $(LIBPTLCTL) $(SELINUX) $(LDLIBMOUNT) $(GSSLIB)
-mount_lustre_DEPENDENCIES := $(LIBPTLCTL)
+mount_lustre_LDADD    := $(SELINUX) $(LDLIBMOUNT) $(PLUGIN_LIB) $(GSSLIB) \
+			 $(top_builddir)/libcfs/libcfs/libcfs.la $(MNTMODLIBS)
+mount_lustre_tgt_SOURCES = ${mount_lustre_SOURCES}
+mount_lustre_tgt_CPPFLAGS = ${mount_lustre_CPPFLAGS}
+mount_lustre_tgt_LDFLAGS = ${mount_lustre_LDFLAGS}
+mount_lustre_tgt_LDADD = ${mount_lustre_LDADD}
 
 mkfs_lustre_SOURCES = mkfs_lustre.c mount_utils.c mount_utils.h $(GSSSRC)
 mkfs_lustre_CPPFLAGS := -UTUNEFS ${MNTMODCFLAGS}
 mkfs_lustre_LDFLAGS  := ${MNTMODLDFLAGS}
-mkfs_lustre_LDADD    := $(LIBPTLCTL) $(LDLIBMOUNT) $(GSSLIB)
-mkfs_lustre_DEPENDENCIES := $(LIBPTLCTL)
+mkfs_lustre_LDADD    := $(mount_lustre_LDADD)
 
 tunefs_lustre_SOURCES = mkfs_lustre.c mount_utils.c mount_utils.h $(GSSSRC)
 tunefs_lustre_CPPFLAGS := -DTUNEFS ${MNTMODCFLAGS}
 tunefs_lustre_LDFLAGS  := ${MNTMODLDFLAGS}
 tunefs_lustre_LDADD    := $(mkfs_lustre_LDADD)
-tunefs_lustre_DEPENDENCIES := $(mkfs_lustre_DEPENDENCIES)
+
+l_tunedisk_SOURCES = l_tunedisk.c mount_utils.c mount_utils.h $(GSSSRC)
+l_tunedisk_CPPFLAGS := ${MNTMODCFLAGS}
+l_tunedisk_LDFLAGS  := ${MNTMODLDFLAGS}
+l_tunedisk_LDADD    := $(mount_lustre_LDADD)
 
 l_getidentity_SOURCES = l_getidentity.c
-l_getidentity_LDADD := $(LIBPTLCTL)
-l_getidentity_DEPENDENCIES := $(LIBPTLCTL)
+l_getidentity_LDADD := $(top_builddir)/libcfs/libcfs/libcfs.la
+l_getidentity_DEPENDENCIES := $(top_builddir)/libcfs/libcfs/libcfs.la
 
 lhsmtool_posix_SOURCES = lhsmtool_posix.c
-lhsmtool_posix_LDADD := liblustreapi.a $(LIBPTLCTL) $(PTHREAD_LIBS)
-lhsmtool_posix_DEPENDENCIES := liblustreapi.a $(LIBPTLCTL)
+lhsmtool_posix_LDADD := liblustreapi.la $(PTHREAD_LIBS)
+lhsmtool_posix_DEPENDENCIES := liblustreapi.la
+
+l_getsepol_SOURCES = l_getsepol.c
+l_getsepol_LDADD := liblustreapi.la -lcrypto $(SELINUX)
+l_getsepol_DEPENDENCIES := liblustreapi.la
 
 wirecheck_SOURCES = wirecheck.c
 wirecheck_CPPFLAGS := -DCC="\"$(CC)\""
@@ -181,7 +224,7 @@ wiretest_SOURCES = wiretest.c
 
 endif # UTILS
 
-EXTRA_DIST = llstat llobdstat plot-llstat ldlm_debug_upcall
+EXTRA_DIST = llstat llobdstat plot-llstat ldlm_debug_upcall liblustreapi.map
 
 # NOTE: this should only be run on i386.
 newwiretest: wirehdr.c wirecheck