X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2FMakefile.am;h=44ae5230e718714b2fda9cbbbef4783ffdd2b435;hb=6bc3237477069c8ddc70deee6e0d7cbbbdf92a08;hp=51b9803912a2ae3d21dcd1af03de82bc1e0a3d81;hpb=0e660eab787c3b2857e4295f1ec554e016393885;p=fs%2Flustre-release.git

diff --git a/lustre/utils/Makefile.am b/lustre/utils/Makefile.am
index 51b9803..44ae523 100644
--- a/lustre/utils/Makefile.am
+++ b/lustre/utils/Makefile.am
@@ -1,106 +1,227 @@
 # Administration utilities Makefile
 
-if GSS
-SUBDIRS = gss
-endif
-
-AM_CFLAGS=$(LLCFLAGS)
-AM_CPPFLAGS=$(LLCPPFLAGS) -DLUSTRE_UTILS=1
-AM_LDFLAGS := -L$(top_builddir)/lnet/utils
+AM_CFLAGS  := -fPIC -D_GNU_SOURCE \
+	      -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DLUSTRE_UTILS=1 $(UTILS_CFLAGS)
+AM_LDFLAGS := $(UTILS_LDFLAGS)
 
-LIBPTLCTL := $(top_builddir)/lnet/utils/libptlctl.a $(top_builddir)/libcfs/libcfs/libcfsutil.a
-
-sbin_scripts = lrun
-bin_scripts = llstat llobdstat plot-llstat llbackup
+if TESTS
+EXTRA_PROGRAMS = wirecheck
+endif
 
 if UTILS
-noinst_PROGRAMS = obdio obdbarrier
-EXTRA_PROGRAMS = wirecheck
+
+if GSS
+SUBDIRS = . gss
+GSSSRC = gss/err_util.c gss/err_util.h
+if GSS_SSK
+GSSSRC += gss/sk_utils.c gss/sk_utils.h
+endif
+GSSLIB = -lcrypto -lssl -lkeyutils -lm
+else
+GSSSRC =
+GSSLIB =
+endif
 
 # mount only finds helpers in /sbin
 rootsbin_PROGRAMS = mount.lustre
-sbin_PROGRAMS = mkfs.lustre tunefs.lustre lctl wiretest \
-	l_getidentity llverfs llverdev \
-	llog_reader lr_reader
+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 \
+		llsom_sync
+
+if TESTS
+sbin_PROGRAMS += wiretest
+endif # TESTS
+
+if SERVER
+sbin_PROGRAMS += mkfs.lustre tunefs.lustre llverdev lr_reader lshowmount \
+		 ll_decode_filter_fid llog_reader l_tunedisk
+endif
 if LIBPTHREAD
-sbin_PROGRAMS += loadgen
+sbin_PROGRAMS += lhsmtool_posix
+endif
+
+if SELINUX
+if GETSEPOL
+sbin_PROGRAMS += l_getsepol
 endif
-bin_PROGRAMS = lfs req_layout
-bin_SCRIPTS = $(bin_scripts)
-sbin_SCRIPTS = $(sbin_scripts)
+endif
+
+lib_LIBRARIES =
+noinst_LIBRARIES =
+if LDISKFS_ENABLED
+libiam_a_SOURCES = libiam.c
+lib_LIBRARIES += libiam.a
+endif
+
+pkglib_LTLIBRARIES =
+lib_LTLIBRARIES = liblustreapi.la
 endif # UTILS
 
-lib_LIBRARIES = liblustreapi.a libiam.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
 
-lctl_SOURCES = obd.c lustre_cfg.c lctl.c obdctl.h
-lctl_LDADD := $(LIBREADLINE) liblustreapi.a $(LIBPTLCTL)
-lctl_DEPENDENCIES := $(LIBPTLCTL)
+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 obd.c lustre_cfg.c
-lfs_LDADD := $(LIBREADLINE) liblustreapi.a $(LIBPTLCTL)
-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
 
-loadgen_SOURCES = loadgen.c lustre_cfg.c obd.c
-loadgen_LDADD := $(LIBREADLINE) liblustreapi.a $(LIBPTLCTL) $(PTHREAD_LIBS)
-loadgen_DEPENDENCIES := $(LIBPTLCTL)
+llsom_sync_LDADD := liblustreapi.la
+llsom_sync_DEPENDENCIES := liblustreapi.la
+
+lshowmount_SOURCES = lshowmount.c nidlist.c nidlist.h
+lshowmount_LDADD :=  liblustreapi.la
 
 if EXT2FS_DEVEL
 EXT2FSLIB = -lext2fs
 E2PLIB = -le2p
 else
-E2PLIB = 
+E2PLIB =
 EXT2FSLIB =
 endif
 
-if BLKID
-BLKIDLIB = -lblkid
-else
-BLKIDLIB =
-endif
-
 llverfs_LDADD := $(EXT2FSLIB) $(E2PLIB)
+llverdev_LDADD := $(EXT2FSLIB) $(blkid_LIBS)
+
+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
 
-llverdev_LDADD := $(EXT2FSLIB) $(BLKIDLIB)
+if UTILS
+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
 
-L_IOCTL := $(top_builddir)/libcfs/libcfs/util/l_ioctl.c
-liblustreapi_a_SOURCES = liblustreapi.c $(L_IOCTL)
+install-exec-hook:
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	$(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)/lustre/$$f"; \
+	    $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/lustre/$$f; \
+	  else :; fi; \
+	done
+endif # UTILS
 
-libiam_a_SOURCES = libiam.c
+llog_reader_SOURCES = llog_reader.c
+llog_reader_LDADD := liblustreapi.la
+llog_reader_DEPENDENCIES := liblustreapi.la
 
-wirecheck_SOURCES = wirecheck.c
-wirecheck_CPPFLAGS = -DCC="\"$(CC)\""
+lr_reader_SOURCES = lr_reader.c
 
-wiretest_SOURCES = wiretest.c
+if UTILS
 
-obdio_SOURCES = obdio.c obdiolib.c obdiolib.h
-obdbarrier_SOURCES = obdbarrier.c obdiolib.c obdiolib.h
-req_layout_SOURCES = req-layout.c
+PLUGIN_LIB =
+if PLUGINS
+MNTMODLDFLAGS := -rdynamic
+MNTMODLIBS := -ldl
+MNTMODCFLAGS := -DPLUGIN_DIR=\"${pkglibdir}\"
+endif # PLUGINS
+
+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
+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    := $(SELINUX) $(LDLIBMOUNT) $(PLUGIN_LIB) $(GSSLIB) \
+			 $(top_builddir)/libcfs/libcfs/libcfs.la $(MNTMODLIBS)
+
+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    := $(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)
+
+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)
 
-llog_reader_SOURCES = llog_reader.c
-llog_reader_LDADD := $(LIBPTLCTL)
-llog_reader_DEPENDENCIES := $(LIBPTLCTL)
+l_getidentity_SOURCES = l_getidentity.c
+l_getidentity_LDADD := $(top_builddir)/libcfs/libcfs/libcfs.la
+l_getidentity_DEPENDENCIES := $(top_builddir)/libcfs/libcfs/libcfs.la
 
-lr_reader_SOURCES = lr_reader.c
+lhsmtool_posix_SOURCES = lhsmtool_posix.c
+lhsmtool_posix_LDADD := liblustreapi.la $(PTHREAD_LIBS)
+lhsmtool_posix_DEPENDENCIES := liblustreapi.la
 
-mount_lustre_SOURCES = mount_lustre.c mount_utils.c mount_utils.h
-mount_lustre_LDADD := $(LIBPTLCTL)
-mount_lustre_DEPENDENCIES := $(LIBPTLCTL)
+l_getsepol_SOURCES = l_getsepol.c
+l_getsepol_LDADD := liblustreapi.la -lcrypto $(SELINUX)
+l_getsepol_DEPENDENCIES := liblustreapi.la
 
-mkfs_lustre_SOURCES = mkfs_lustre.c mount_utils.c mount_utils.h
-mkfs_lustre_CPPFLAGS = -UTUNEFS $(AM_CPPFLAGS)
-mkfs_lustre_LDADD := libiam.a $(LIBPTLCTL)
-mkfs_lustre_DEPENDENCIES := $(LIBPTLCTL) libiam.a
+wirecheck_SOURCES = wirecheck.c
+wirecheck_CPPFLAGS := -DCC="\"$(CC)\""
 
-tunefs_lustre_SOURCES = $(mkfs_lustre_SOURCES)
-tunefs_lustre_CPPFLAGS = -DTUNEFS $(AM_CPPFLAGS)
-tunefs_lustre_LDADD := $(mkfs_lustre_LDADD)
-tunefs_lustre_DEPENDENCIES := $(mkfs_lustre_DEPENDENCIES)
+wiretest_SOURCES = wiretest.c
 
-l_getidentity_SOURCES = l_getidentity.c
-l_getidentity_LDADD := $(LIBPTLCTL)
-l_getidentity_DEPENDENCIES := $(LIBPTLCTL)
+endif # UTILS
 
-EXTRA_DIST = $(sbin_scripts) $(bin_scripts)
+EXTRA_DIST = llstat llobdstat plot-llstat ldlm_debug_upcall liblustreapi.map
 
 # NOTE: this should only be run on i386.
 newwiretest: wirehdr.c wirecheck
@@ -108,4 +229,3 @@ newwiretest: wirehdr.c wirecheck
 	LANG=C ./wirecheck >> wiretest.c
 	cp ../ptlrpc/wirehdr.c ../ptlrpc/wiretest.c
 	LANG=C ./wirecheck >> ../ptlrpc/wiretest.c
-