X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Futils%2FMakefile.am;h=b8afa14cdde120b3d9b6233d0bac613c4e83bb80;hp=dcf340f20bf9c65160a8eeff1ec16043e676ac22;hb=549c57e77b7f3a4cae5a7381d612a499c2ca3dcc;hpb=bfb38a047e0fc12e68a7aa3a2d2ec7a6e9d696ed

diff --git a/lustre/utils/Makefile.am b/lustre/utils/Makefile.am
index dcf340f..b8afa14 100644
--- a/lustre/utils/Makefile.am
+++ b/lustre/utils/Makefile.am
@@ -1,62 +1,70 @@
 # Administration utilities Makefile
 
-if GSS
-SUBDIRS = gss
-endif
-
-AM_CFLAGS=$(LLCFLAGS)
-AM_CPPFLAGS=$(LLCPPFLAGS) -DLUSTRE_UTILS=1
+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
 
-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
+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 lshowmount lustre_rsync \
-	ll_recover_lost_found_objs ltrack_stats ll_decode_filter_fid
+bin_SCRIPTS   = llstat llobdstat plot-llstat
+bin_PROGRAMS  = lfs
+sbin_SCRIPTS  = ldlm_debug_upcall
+sbin_PROGRAMS = lctl l_getidentity llverfs lustre_rsync ltrack_stats
+
+if TESTS
+bin_PROGRAMS  += req_layout
+sbin_PROGRAMS += wiretest
+endif # TESTS
+
+if SERVER
+sbin_PROGRAMS += mkfs.lustre tunefs.lustre llverdev lr_reader \
+	ll_recover_lost_found_objs ll_decode_filter_fid llog_reader
+endif
 if LIBPTHREAD
-sbin_PROGRAMS += loadgen
+sbin_PROGRAMS += lhsmtool_posix
 endif
-bin_PROGRAMS = lfs req_layout
-bin_SCRIPTS = $(bin_scripts)
-sbin_SCRIPTS = $(sbin_scripts)
-endif # UTILS
 
-lib_LIBRARIES = liblustreapi.a libiam.a
+pkglib_LTLIBRARIES =
+lib_LIBRARIES = liblustreapi.a
+if LDISKFS_ENABLED
+lib_LIBRARIES += libiam.a
+endif
+noinst_LIBRARIES = liblustreapitmp.a
+endif # UTILS
 
 lctl_SOURCES = lustre_lfsck.c obd.c lustre_cfg.c lctl.c obdctl.h
-lctl_LDADD := $(LIBREADLINE) liblustreapi.a $(LIBPTLCTL) $(PTHREAD_LIBS)
+lctl_LDADD :=  liblustreapi.a $(LIBPTLCTL) $(LIBREADLINE) $(PTHREAD_LIBS)
 lctl_DEPENDENCIES := $(LIBPTLCTL) liblustreapi.a
 
-lfs_SOURCES = lfs.c obd.c lustre_cfg.c
-lfs_LDADD := $(LIBREADLINE) liblustreapi.a $(LIBPTLCTL) $(PTHREAD_LIBS)
+lfs_SOURCES = lfs.c
+lfs_LDADD := liblustreapi.a $(LIBPTLCTL) $(LIBREADLINE)
 lfs_DEPENDENCIES := $(LIBPTLCTL) liblustreapi.a
 
-loadgen_SOURCES = loadgen.c lustre_cfg.c obd.c
-loadgen_LDADD := $(LIBREADLINE) liblustreapi.a $(LIBPTLCTL) $(PTHREAD_LIBS)
-loadgen_DEPENDENCIES := $(LIBPTLCTL) liblustreapi.a
-
 lustre_rsync_SOURCES = lustre_rsync.c obd.c lustre_cfg.c lustre_rsync.h
-lustre_rsync_LDADD := $(LIBREADLINE) liblustreapi.a $(LIBPTLCTL) $(PTHREAD_LIBS)
+lustre_rsync_LDADD :=  liblustreapi.a $(LIBPTLCTL) $(LIBREADLINE) $(PTHREAD_LIBS)
 lustre_rsync_DEPENDENCIES := $(LIBPTLCTL) liblustreapi.a
 
 ll_recover_lost_found_objs_SOURCES = ll_recover_lost_found_objs.c
 ll_recover_lost_found_objs_LDADD := $(LIBPTLCTL)
 ll_recover_lost_found_objs_DEPENDENCIES := $(LIBPTLCTL)
 
-lshowmount_SOURCES = lshowmount.c nidlist.c nidlist.h
-
 if EXT2FS_DEVEL
 EXT2FSLIB = -lext2fs
 E2PLIB = -le2p
@@ -75,61 +83,80 @@ llverfs_LDADD := $(EXT2FSLIB) $(E2PLIB)
 
 llverdev_LDADD := $(EXT2FSLIB) $(BLKIDLIB)
 
-L_IOCTL := $(top_builddir)/libcfs/libcfs/util/l_ioctl.c
-L_KERNELCOMM := $(top_builddir)/libcfs/libcfs/kernel_user_comm.c
-liblustreapi_a_SOURCES = liblustreapi.c $(L_IOCTL) $(L_KERNELCOMM)
+L_STRING := $(top_builddir)/libcfs/libcfs/util/string.c
+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 $(L_STRING)
 
-libiam_a_SOURCES = libiam.c
-
-wirecheck_SOURCES = wirecheck.c
-wirecheck_CPPFLAGS = -DCC="\"$(CC)\""
+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
+
+install-exec-hook: liblustreapi.so
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	@list=$< ; for p in $$list; 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; \
+	  else :; fi; \
+	done
+endif # UTILS
 
-wiretest_SOURCES = wiretest.c
+if LDISKFS_ENABLED
+libiam_a_SOURCES = libiam.c
+endif
 
-obdio_SOURCES = obdio.c obdiolib.c obdiolib.h
-obdbarrier_SOURCES = obdbarrier.c obdiolib.c obdiolib.h
 req_layout_SOURCES = req-layout.c
 
 llog_reader_SOURCES = llog_reader.c
-llog_reader_LDADD := $(LIBPTLCTL)
-llog_reader_DEPENDENCIES := $(LIBPTLCTL)
+llog_reader_LDADD := $(LIBPTLCTL) liblustreapi.a
+llog_reader_DEPENDENCIES := $(LIBPTLCTL) liblustreapi.a
 
 lr_reader_SOURCES = lr_reader.c
 
+if UTILS
+
+if ZFS_ENABLED
+pkglib_LTLIBRARIES += mount_osd_zfs.la
+
+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
+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)
+endif # LDISKFS_ENABLED
+
 mount_lustre_SOURCES = mount_lustre.c mount_utils.c mount_utils.h
-mount_lustre_SOURCES += mount_utils_ldiskfs.c
-mount_lustre_LDADD := $(LIBPTLCTL)
+mount_lustre_CPPFLAGS := ${MNTMODCFLAGS}
+mount_lustre_LDFLAGS  := ${MNTMODLDFLAGS}
+mount_lustre_LDADD    := $(LIBPTLCTL) $(SELINUX)
 mount_lustre_DEPENDENCIES := $(LIBPTLCTL)
-if ZFS_ENABLED
-mount_lustre_SOURCES += mount_utils_zfs.c
-mount_lustre_CPPFLAGS = -DHAVE_IOCTL_IN_UNISTD_H
-mount_lustre_CPPFLAGS += -I /usr/include/libspl -I /usr/include/libzfs
-mount_lustre_LDFLAGS = -pthread -rdynamic -ldl
-endif
 
 mkfs_lustre_SOURCES = mkfs_lustre.c mount_utils.c mount_utils.h
-mkfs_lustre_SOURCES += mount_utils_ldiskfs.c
-mkfs_lustre_CPPFLAGS = -UTUNEFS $(AM_CPPFLAGS)
-mkfs_lustre_LDADD := libiam.a $(LIBPTLCTL)
-mkfs_lustre_DEPENDENCIES := $(LIBPTLCTL) libiam.a
-if ZFS_ENABLED
-mkfs_lustre_SOURCES += mount_utils_zfs.c
-mkfs_lustre_CPPFLAGS += -DHAVE_IOCTL_IN_UNISTD_H
-mkfs_lustre_CPPFLAGS += -I /usr/include/libspl -I /usr/include/libzfs
-mkfs_lustre_LDFLAGS = -pthread -rdynamic -ldl
-endif
+mkfs_lustre_CPPFLAGS := -UTUNEFS ${MNTMODCFLAGS}
+mkfs_lustre_LDFLAGS  := ${MNTMODLDFLAGS}
+mkfs_lustre_LDADD    := $(LIBPTLCTL)
+mkfs_lustre_DEPENDENCIES := $(LIBPTLCTL)
 
 tunefs_lustre_SOURCES = mkfs_lustre.c mount_utils.c mount_utils.h
-tunefs_lustre_SOURCES += mount_utils_ldiskfs.c
-tunefs_lustre_CPPFLAGS = -DTUNEFS $(AM_CPPFLAGS)
-tunefs_lustre_LDADD := $(mkfs_lustre_LDADD)
+tunefs_lustre_CPPFLAGS := -DTUNEFS ${MNTMODCFLAGS}
+tunefs_lustre_LDFLAGS  := ${MNTMODLDFLAGS}
+tunefs_lustre_LDADD    := $(mkfs_lustre_LDADD)
 tunefs_lustre_DEPENDENCIES := $(mkfs_lustre_DEPENDENCIES)
-if ZFS_ENABLED
-tunefs_lustre_SOURCES += mount_utils_zfs.c
-tunefs_lustre_CPPFLAGS += -DHAVE_IOCTL_IN_UNISTD_H
-tunefs_lustre_CPPFLAGS += -I /usr/include/libspl -I /usr/include/libzfs
-tunefs_lustre_LDFLAGS = -pthread -rdynamic -ldl
-endif
 
 l_getidentity_SOURCES = l_getidentity.c
 l_getidentity_LDADD := $(LIBPTLCTL)
@@ -137,7 +164,18 @@ l_getidentity_DEPENDENCIES := $(LIBPTLCTL)
 
 ltrack_stats_SOURCES = ltrack_stats.c
 
-EXTRA_DIST = $(sbin_scripts) $(bin_scripts)
+lhsmtool_posix_SOURCES = lhsmtool_posix.c
+lhsmtool_posix_LDADD := liblustreapi.a $(LIBPTLCTL) $(PTHREAD_LIBS)
+lhsmtool_posix_DEPENDENCIES := liblustreapi.a $(LIBPTLCTL)
+
+wirecheck_SOURCES = wirecheck.c
+wirecheck_CPPFLAGS := -DCC="\"$(CC)\""
+
+wiretest_SOURCES = wiretest.c
+
+endif # UTILS
+
+EXTRA_DIST = llstat llobdstat plot-llstat ldlm_debug_upcall
 
 # NOTE: this should only be run on i386.
 newwiretest: wirehdr.c wirecheck
@@ -145,4 +183,3 @@ newwiretest: wirehdr.c wirecheck
 	LANG=C ./wirecheck >> wiretest.c
 	cp ../ptlrpc/wirehdr.c ../ptlrpc/wiretest.c
 	LANG=C ./wirecheck >> ../ptlrpc/wiretest.c
-