Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-1711 mount: obd_mount to start osd
[fs/lustre-release.git]
/
lnet
/
utils
/
Makefile.am
diff --git
a/lnet/utils/Makefile.am
b/lnet/utils/Makefile.am
index
cfcabf5
..
9f28a28
100644
(file)
--- a/
lnet/utils/Makefile.am
+++ b/
lnet/utils/Makefile.am
@@
-38,15
+38,10
@@
#COMPILE = $(CC) -Wall -g -I$(srcdir)/../include -I../../include
#LINK = $(CC) -o $@
#COMPILE = $(CC) -Wall -g -I$(srcdir)/../include -I../../include
#LINK = $(CC) -o $@
+LIBCFS= $(top_builddir)/libcfs/libcfs/libcfs.a
LIBCFSUTIL= $(top_builddir)/libcfs/libcfs/libcfsutil.a
if LIBLUSTRE
LIBCFSUTIL= $(top_builddir)/libcfs/libcfs/libcfsutil.a
if LIBLUSTRE
-SUBDIRS = . pthread
-endif
-
-DIST_SUBDIRS = pthread
-
-if LIBLUSTRE
noinst_LIBRARIES = libuptlctl.a
endif
noinst_LIBRARIES = libuptlctl.a
endif
@@
-67,21
+62,15
@@
libptlctl_a_SOURCES = portals.c debug.c
if UTILS
sbin_PROGRAMS += ptlctl routerstat wirecheck lst
if UTILS
sbin_PROGRAMS += ptlctl routerstat wirecheck lst
-
-if BUILD_GMLND
-sbin_PROGRAMS += gmlndnid
+if LIBLUSTRE
+sbin_PROGRAMS += lstclient
endif
endif
wirecheck_SOURCES = wirecheck.c
endif
endif
wirecheck_SOURCES = wirecheck.c
-gmlndnid_SOURCES = gmlndnid.c
-gmlndnid_CFLAGS = $(GMCPPFLAGS)
-gmlndnid_LDFLAGS = -static
-gmlndnid_LDADD = $(GMLIBS) -lgm
-
ptlctl_SOURCES = ptlctl.c
ptlctl_SOURCES = ptlctl.c
-ptlctl_LDADD = -L. -lptlctl $(LIBCFSUTIL) $(LIBREADLINE) $(LIBEFENCE)
+ptlctl_LDADD = -L. -lptlctl $(LIBCFSUTIL) $(LIB
CFS) $(LIB
READLINE) $(LIBEFENCE)
ptlctl_DEPENDENCIES = libptlctl.a
routerstat_SOURCES = routerstat.c
ptlctl_DEPENDENCIES = libptlctl.a
routerstat_SOURCES = routerstat.c
@@
-91,21
+80,22
@@
debugctl_LDADD = -L. -lptlctl $(LIBCFSUTIL) $(LIBREADLINE) $(LIBEFENCE)
debugctl_DEPENDENCIES = libptlctl.a
lst_SOURCES = lst.c
debugctl_DEPENDENCIES = libptlctl.a
lst_SOURCES = lst.c
-lst_LDADD = -L. -lptlctl $(LIBCFSUTIL) $(LIBREADLINE) $(LIBEFENCE)
+lst_LDADD = -L. -lptlctl $(LIBCFSUTIL) $(LIB
CFS) $(LIB
READLINE) $(LIBEFENCE)
lst_DEPENDENCIES = libptlctl.a
LND_LIBS =
if BUILD_USOCKLND
LND_LIBS += $(top_builddir)/lnet/ulnds/socklnd/libsocklnd.a
endif
lst_DEPENDENCIES = libptlctl.a
LND_LIBS =
if BUILD_USOCKLND
LND_LIBS += $(top_builddir)/lnet/ulnds/socklnd/libsocklnd.a
endif
-if BUILD_UPTLLND
-LND_LIBS += $(top_builddir)/lnet/ulnds/ptllnd/libptllnd.a
-endif
if LIBLUSTRE
LIB_SELFTEST = $(top_builddir)/libcfs/libcfs/libcfs.a $(top_builddir)/lnet/lnet/liblnet.a $(top_builddir)/lnet/selftest/libselftest.a
liblst.a : $(LIB_SELFTEST) $(LND_LIBS)
sh $(srcdir)/genlib.sh "$(LIBS)" "$(LND_LIBS)" "$(PTHREAD_LIBS)"
if LIBLUSTRE
LIB_SELFTEST = $(top_builddir)/libcfs/libcfs/libcfs.a $(top_builddir)/lnet/lnet/liblnet.a $(top_builddir)/lnet/selftest/libselftest.a
liblst.a : $(LIB_SELFTEST) $(LND_LIBS)
sh $(srcdir)/genlib.sh "$(LIBS)" "$(LND_LIBS)" "$(PTHREAD_LIBS)"
+
+lstclient_SOURCES = lstclient.c
+lstclient_LDADD = -L. -lptlctl -llst $(LIBREADLINE) $(LIBEFENCE) $(PTHREAD_LIBS)
+lstclient_DEPENDENCIES = libptlctl.a liblst.a
endif
EXTRA_DIST = genlib.sh
endif
EXTRA_DIST = genlib.sh