X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Futils%2FMakefile.am;h=16047da19e0f296a54a0650321168232cd4ce453;hb=23f80c74c38dfd726ac1b50176989b3aa14e3a81;hp=8ff8cca40b979a4fd7bcf00d81af9a71167d3997;hpb=a9ab51fcbd1b4dbe4c23ff774782d598f6f91ffa;p=fs%2Flustre-release.git

diff --git a/lnet/utils/Makefile.am b/lnet/utils/Makefile.am
index 8ff8cca..16047da 100644
--- 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
-# 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
 #
@@ -28,42 +24,51 @@
 # Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2013, 2015, 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  := -fPIC -D_GNU_SOURCE
+AM_LDFLAGS := -L.
 
-AM_CFLAGS = $(LLCFLAGS)
+if BUILD_DLC
+SUBDIRS = lnetconfig
+endif # BUILD_DLC
 
 LIBCFS= $(top_builddir)/libcfs/libcfs/libcfs.a
 LIBCFSUTIL= $(top_builddir)/libcfs/libcfs/libcfsutil.a
 
-lib_LIBRARIES = libptlctl.a
-
-libptlctl_a_SOURCES = portals.c debug.c
-
-sbin_PROGRAMS =
-
 if UTILS
-sbin_PROGRAMS += routerstat wirecheck lst
-endif
+sbin_PROGRAMS = routerstat lst
 
-wirecheck_SOURCES = wirecheck.c
+if BUILD_DLC
+sbin_PROGRAMS += lnetctl
+endif # BUILD_DLC
 
 routerstat_SOURCES = routerstat.c
+routerstat_LDADD = $(LIBCFS)
 
 lst_SOURCES = lst.c
-lst_LDADD = -L. -lptlctl $(LIBCFSUTIL) $(LIBCFS) $(LIBREADLINE) $(LIBEFENCE)
+lst_CPPFLAGS = -I$(top_builddir)/lustre
+lst_LDADD = -lptlctl $(LIBCFSUTIL) $(LIBCFS) $(LIBREADLINE) $(LIBEFENCE)
 lst_DEPENDENCIES = libptlctl.a
 
-LND_LIBS =
-if BUILD_USOCKLND
-LND_LIBS +=    $(top_builddir)/lnet/ulnds/socklnd/libsocklnd.a
-endif
+if TESTS
+sbin_PROGRAMS += wirecheck
+
+wirecheck_SOURCES = wirecheck.c
+endif # TESTS
+
+lib_LIBRARIES = libptlctl.a
+libptlctl_a_SOURCES = portals.c debug.c
 
-EXTRA_DIST = genlib.sh
+CYAML := $(top_builddir)/lnet/utils/cyaml/cyaml.c
+lnetctl_SOURCES = lnetctl.c $(CYAML)
+lnetctl_LDADD = $(top_builddir)/lnet/utils/lnetconfig/liblnetconfig.la \
+		$(LIBCFSUTIL) $(LIBCFS) $(LIBREADLINE) $(LIBEFENCE) -lyaml -lm
+lnetctl_DEPENDENCIES = $(top_builddir)/lnet/utils/lnetconfig/liblnetconfig.la
+endif # UTILS