X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Futils%2FMakefile.am;h=5b09c54ae0ef4f4b17e6b499692959fb2b40e9b9;hp=bfeebd72de2268c70a3233352deb95be62b47513;hb=073e67f1647008c721d452ee3862c3f643f6c248;hpb=93acd158c57c4c5d0fc751d46741231490c04707

diff --git a/lustre/utils/Makefile.am b/lustre/utils/Makefile.am
index bfeebd72..5b09c54 100644
--- a/lustre/utils/Makefile.am
+++ b/lustre/utils/Makefile.am
@@ -1,20 +1,96 @@
 # Administration utilities Makefile
-DEFS=
-
-CFLAGS:=-g -O2 -I$(top_srcdir)/utils -I$(PORTALS)/include  -I$(srcdir)/../include -Wall -L$(PORTALSLIB)
-KFLAGS:=
-CPPFLAGS = $(HAVE_LIBREADLINE)
-obdctl_LDADD := $(LIBREADLINE)
-lctl_LDADD := $(LIBREADLINE) -lptlctl
-sbin_PROGRAMS = lctl lfind lstripe obdctl obdio obdbarrier obdstat
-sbin_SCRIPTS = lconf lmc llanalyze
-obdctl_SOURCES = parser.c obdctl.c obd.c parser.h obdctl.h
-lctl_SOURCES = parser.c obd.c lctl.c parser.h
+
+AM_CFLAGS=$(LLCFLAGS)
+AM_CPPFLAGS=$(LLCPPFLAGS) -DLUSTRE_UTILS=1
+AM_LDFLAGS := -L$(top_builddir)/lnet/utils
+
+LIBPTLCTL := $(top_builddir)/lnet/utils/libptlctl.a
+
+sbin_scripts = lrun 
+bin_scripts = llstat llobdstat plot-llstat
+
+if UTILS
+noinst_PROGRAMS = wirecheck wiretest obdio obdbarrier
+# mount only finds helpers in /sbin
+rootsbin_PROGRAMS = mount.lustre
+sbin_PROGRAMS = mkfs.lustre tunefs.lustre lctl \
+	l_getgroups llverfs llverdev llog_reader lr_reader
+if LIBPTHREAD
+sbin_PROGRAMS += loadgen
+endif
+bin_PROGRAMS = lfs
+bin_SCRIPTS = $(bin_scripts)
+sbin_SCRIPTS = $(sbin_scripts)
+endif # UTILS
+
+lib_LIBRARIES = liblustreapi.a
+
+lctl_SOURCES = parser.c obd.c lustre_cfg.c lctl.c parser.h obdctl.h platform.h
+lctl_LDADD := $(LIBREADLINE) $(LIBPTLCTL)
+lctl_DEPENDENCIES := $(LIBPTLCTL)
+
+lfs_SOURCES = lfs.c parser.c lustre_cfg.c obd.c
+lfs_LDADD := $(LIBREADLINE) liblustreapi.a $(LIBPTLCTL)
+lfs_DEPENDENCIES := $(LIBPTLCTL) liblustreapi.a 
+
+loadgen_SOURCES = loadgen.c lustre_cfg.c obd.c
+loadgen_LDADD := $(LIBREADLINE) $(LIBPTLCTL) $(PTHREAD_LIBS)
+loadgen_DEPENDENCIES := $(LIBPTLCTL)
+
+if EXT2FS_DEVEL
+EXT2FSLIB = -lext2fs
+E2PLIB = -le2p
+else
+E2PLIB = 
+EXT2FSLIB =
+endif
+
+if BLKID
+BLKIDLIB = -lblkid
+else
+BLKIDLIB =
+endif
+
+llverfs_LDADD := $(EXT2FSLIB) $(E2PLIB)
+
+llverdev_LDADD := $(EXT2FSLIB) $(BLKIDLIB)
+
+liblustreapi_a_SOURCES = liblustreapi.c
+
+wirecheck_SOURCES = wirecheck.c
+wirecheck_CPPFLAGS = -DCC="\"$(CC)\""
+
+wiretest_SOURCES = wiretest.c
+
 obdio_SOURCES = obdio.c obdiolib.c obdiolib.h
 obdbarrier_SOURCES = obdbarrier.c obdiolib.c obdiolib.h
-lfind_SOURCES = lfind.c
-lstripe_SOURCES = lstripe.c
-lfind_CPPFLAGS = -D_XOPEN_SOURCE=500
-EXTRA_DIST = $(sbin_SCRIPTS)
 
-include $(top_srcdir)/Rules
+llog_reader_SOURCES = llog_reader.c
+llog_reader_LDADD := $(LIBPTLCTL)
+llog_reader_DEPENDENCIES := $(LIBPTLCTL)
+
+lr_reader_SOURCES = lr_reader.c
+
+mount_lustre_SOURCES = mount_lustre.c 
+mount_lustre_LDADD := $(LIBPTLCTL)
+mount_lustre_DEPENDENCIES := $(LIBPTLCTL)
+
+mkfs_lustre_SOURCES = mkfs_lustre.c
+mkfs_lustre_CPPFLAGS = -UTUNEFS $(AM_CPPFLAGS)
+mkfs_lustre_LDADD := $(LIBPTLCTL)
+mkfs_lustre_DEPENDENCIES := $(LIBPTLCTL)
+
+tunefs_lustre_SOURCES = $(mkfs_lustre_SOURCES)
+tunefs_lustre_CPPFLAGS = -DTUNEFS $(AM_CPPFLAGS)
+tunefs_lustre_LDADD := $(mkfs_lustre_LDADD)
+tunefs_lustre_DEPENDENCIES := $(mkfs_lustre_DEPENDENCIES)
+
+EXTRA_DIST = $(sbin_scripts) $(bin_scripts)
+
+# NOTE: this should only be run on i386.
+newwiretest: wirehdr.c wirecheck
+	cp wirehdr.c wiretest.c
+	./wirecheck >> wiretest.c
+	cp ../ptlrpc/wirehdr.c ../ptlrpc/wiretest.c
+	./wirecheck >> ../ptlrpc/wiretest.c
+