LU-1154 clio: rename coo_attr_set to coo_attr_update

[fs/lustre-release.git] / lnet / utils / Makefile.am

diff --git a/lnet/utils/Makefile.am b/lnet/utils/Makefile.am
index dd7b9e4..49c248b 100644 (file)
--- a/lnet/utils/Makefile.am
+++ b/lnet/utils/Makefile.am
@@ -28,30 +28,31 @@
 # Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2013, 2014, Intel Corporation.
+#
 
 #
 # This file is part of Lustre, http://www.lustre.org/
 # Lustre is a trademark of Sun Microsystems, Inc.
 #
 
-## $(srcdir)/../ for <portals/*.h>, ../../ for generated <config.h>
-#COMPILE = $(CC) -Wall -g -I$(srcdir)/../include -I../../include
-#LINK = $(CC) -o $@
+AM_CFLAGS = $(LLCFLAGS)
 
-LIBCFS= $(top_builddir)/libcfs/libcfs/libcfs.a
-LIBCFSUTIL= $(top_builddir)/libcfs/libcfs/libcfsutil.a
-
-lib_LIBRARIES = libptlctl.a
+if BUILD_DLC
+SUBDIRS = lnetconfig
+endif
 
-libptlctl_a_SOURCES = portals.c debug.c
+AM_LDFLAGS := -L$(top_builddir)/lnet/utils/lnetconfig
 
-sbin_PROGRAMS =
+LIBCFS= $(top_builddir)/libcfs/libcfs/libcfs.a
+LIBCFSUTIL= $(top_builddir)/libcfs/libcfs/libcfsutil.a
 
 if UTILS
-sbin_PROGRAMS += routerstat wirecheck lst
-endif
+sbin_PROGRAMS = routerstat lst
 
-wirecheck_SOURCES = wirecheck.c
+if BUILD_DLC
+sbin_PROGRAMS += lnetctl
+endif
 
 routerstat_SOURCES = routerstat.c
 
@@ -59,9 +60,19 @@ lst_SOURCES = lst.c
 lst_LDADD = -L. -lptlctl $(LIBCFSUTIL) $(LIBCFS) $(LIBREADLINE) $(LIBEFENCE)
 lst_DEPENDENCIES = libptlctl.a
 
-LND_LIBS =
-if BUILD_USOCKLND
-LND_LIBS +=    $(top_builddir)/lnet/ulnds/socklnd/libsocklnd.a
+if TESTS
+sbin_PROGRAMS += wirecheck
+
+wirecheck_SOURCES = wirecheck.c
 endif
 
-EXTRA_DIST = genlib.sh
+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_LDADD = -L. -lm -lyaml -llnetconfig \
+               $(LIBCFSUTIL) $(LIBCFS) $(LIBREADLINE) $(LIBEFENCE)
+lnetctl_DEPENDENCIES = $(top_builddir)/lnet/utils/lnetconfig/liblnetconfig.so
+endif # UTILS