X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Futils%2FMakefile.am;h=8704f5ba5fda8ba2514a960b42dab71d7a0475ab;hp=145d9b4e502d328689200022eac5183d620b203d;hb=510aea4a37ea26769be5946ca93a4576a1dd4095;hpb=14e8e8e8a6b1bfe370e3e1f9fef6e37ccfc23290 diff --git a/lustre/utils/Makefile.am b/lustre/utils/Makefile.am index 145d9b4..8704f5b 100644 --- a/lustre/utils/Makefile.am +++ b/lustre/utils/Makefile.am @@ -1,8 +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 + -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DLUSTRE_UTILS=1 $(UTILS_CFLAGS) +AM_LDFLAGS := $(UTILS_LDFLAGS) if TESTS EXTRA_PROGRAMS = wirecheck @@ -23,11 +23,12 @@ 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 sbin_PROGRAMS += wiretest @@ -35,12 +36,18 @@ 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 +if SELINUX +if GETSEPOL +sbin_PROGRAMS += l_getsepol +endif +endif + lib_LIBRARIES = noinst_LIBRARIES = if LDISKFS_ENABLED @@ -56,17 +63,21 @@ 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) +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 +lfs_LDADD := liblustreapi.la -lz +lfs_LDADD += $(top_builddir)/lnet/utils/lnetconfig/liblnetconfig.la lfs_DEPENDENCIES := liblustreapi.la -lustre_rsync_SOURCES = lustre_rsync.c lustre_rsync.h +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 +llsom_sync_LDADD := liblustreapi.la +llsom_sync_DEPENDENCIES := liblustreapi.la + lshowmount_SOURCES = lshowmount.c nidlist.c nidlist.h lshowmount_LDADD := liblustreapi.la @@ -78,24 +89,18 @@ 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_la_LDFLAGS = $(LIBREADLINE) -version-info 1:0:0 + 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 if UTILS @@ -132,7 +137,8 @@ if UTILS PLUGIN_LIB = if PLUGINS -MNTMODLDFLAGS := -rdynamic -ldl +MNTMODLDFLAGS := -rdynamic +MNTMODLIBS := -ldl MNTMODCFLAGS := -DPLUGIN_DIR=\"${pkglibdir}\" endif # PLUGINS @@ -147,9 +153,11 @@ 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` + `$(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 @@ -164,8 +172,9 @@ if PLUGINS lib_LTLIBRARIES += libmount_utils_ldiskfs.la libmount_utils_ldiskfs.la : libmount_utils_ldiskfs.a $(CC) $(LDFLAGS) $(MNTMODLDFLAGS) -shared -export-dynamic \ - $(SELINUX) -o mount_osd_ldiskfs.so \ - `$(AR) -t libmount_utils_ldiskfs.a` + -o mount_osd_ldiskfs.so \ + `$(AR) -t libmount_utils_ldiskfs.a` \ + $(MNTMODLIBS) $(SELINUX) else PLUGIN_LIB += libmount_utils_ldiskfs.a endif # PLUGINS @@ -174,8 +183,12 @@ 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 := $(top_builddir)/libcfs/libcfs/libcfs.la \ - $(SELINUX) $(LDLIBMOUNT) $(PLUGIN_LIB) $(GSSLIB) +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} @@ -187,6 +200,11 @@ 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) + l_getidentity_SOURCES = l_getidentity.c l_getidentity_LDADD := $(top_builddir)/libcfs/libcfs/libcfs.la l_getidentity_DEPENDENCIES := $(top_builddir)/libcfs/libcfs/libcfs.la @@ -195,6 +213,10 @@ lhsmtool_posix_SOURCES = lhsmtool_posix.c 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)\"" @@ -202,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