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-11282 tests: log skip message for sanityn test_19
[fs/lustre-release.git]
/
lnet
/
utils
/
Makefile.am
diff --git
a/lnet/utils/Makefile.am
b/lnet/utils/Makefile.am
index
60d5f6c
..
97c52d8
100644
(file)
--- a/
lnet/utils/Makefile.am
+++ b/
lnet/utils/Makefile.am
@@
-15,11
+15,7
@@
#
# You should have received a copy of the GNU General Public License
# version 2 along with this program; If not, see
#
# You should have received a copy of the GNU General Public License
# version 2 along with this program; If not, see
-# http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
-#
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# http://www.gnu.org/licenses/gpl-2.0.html
#
# GPL HEADER END
#
#
# GPL HEADER END
#
@@
-39,27
+35,17
@@
AM_CFLAGS := -fPIC -D_GNU_SOURCE
AM_LDFLAGS := -L.
AM_CFLAGS := -fPIC -D_GNU_SOURCE
AM_LDFLAGS := -L.
-if BUILD_DLC
SUBDIRS = lnetconfig
SUBDIRS = lnetconfig
-endif # BUILD_DLC
-
-LIBCFS= $(top_builddir)/libcfs/libcfs/libcfs.a
-LIBCFSUTIL= $(top_builddir)/libcfs/libcfs/libcfsutil.a
if UTILS
if UTILS
-sbin_PROGRAMS = routerstat lst
-
-if BUILD_DLC
-sbin_PROGRAMS += lnetctl
-endif # BUILD_DLC
+sbin_PROGRAMS = routerstat lst lnetctl
routerstat_SOURCES = routerstat.c
routerstat_SOURCES = routerstat.c
-routerstat_LDADD = $(
LIBCFS)
+routerstat_LDADD = $(
top_builddir)/lnet/utils/lnetconfig/liblnetconfig.la
lst_SOURCES = lst.c
lst_SOURCES = lst.c
-lst_CPPFLAGS = -I$(top_builddir)/lustre
-lst_LDADD = -lptlctl $(LIBCFSUTIL) $(LIBCFS) $(LIBREADLINE) $(LIBEFENCE)
-lst_DEPENDENCIES = libptlctl.a
+lst_LDADD = $(top_builddir)/lnet/utils/lnetconfig/liblnetconfig.la \
+ $(LIBEFENCE)
if TESTS
sbin_PROGRAMS += wirecheck
if TESTS
sbin_PROGRAMS += wirecheck
@@
-67,12
+53,7
@@
sbin_PROGRAMS += wirecheck
wirecheck_SOURCES = wirecheck.c
endif # TESTS
wirecheck_SOURCES = wirecheck.c
endif # TESTS
-lib_LIBRARIES = libptlctl.a
-libptlctl_a_SOURCES = portals.c debug.c
-
-CYAML := $(top_builddir)/lnet/utils/cyaml/cyaml.c
-lnetctl_SOURCES = lnetctl.c $(CYAML)
+lnetctl_SOURCES = lnetctl.c
lnetctl_LDADD = $(top_builddir)/lnet/utils/lnetconfig/liblnetconfig.la \
lnetctl_LDADD = $(top_builddir)/lnet/utils/lnetconfig/liblnetconfig.la \
- $(LIBCFSUTIL) $(LIBCFS) $(LIBREADLINE) $(LIBEFENCE) -lyaml -lm
-lnetctl_DEPENDENCIES = $(top_builddir)/lnet/utils/lnetconfig/liblnetconfig.la
+ $(LIBEFENCE)
endif # UTILS
endif # UTILS