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

diff --git a/lnet/utils/Makefile.am b/lnet/utils/Makefile.am
index 28228ee..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,17 +24,20 @@
 # 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.
 #
 
-AM_CFLAGS = $(LLCFLAGS)
+AM_CFLAGS  := -fPIC -D_GNU_SOURCE
+AM_LDFLAGS := -L.
 
 if BUILD_DLC
 SUBDIRS = lnetconfig
-endif
+endif # BUILD_DLC
 
 LIBCFS= $(top_builddir)/libcfs/libcfs/libcfs.a
 LIBCFSUTIL= $(top_builddir)/libcfs/libcfs/libcfsutil.a
@@ -46,26 +45,30 @@ LIBCFSUTIL= $(top_builddir)/libcfs/libcfs/libcfsutil.a
 if UTILS
 sbin_PROGRAMS = routerstat lst
 
+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
 
 if TESTS
 sbin_PROGRAMS += wirecheck
 
 wirecheck_SOURCES = wirecheck.c
-endif
+endif # TESTS
 
 lib_LIBRARIES = libptlctl.a
-
 libptlctl_a_SOURCES = portals.c debug.c
-endif # UTILS
 
-LND_LIBS =
-if BUILD_USOCKLND
-LND_LIBS += $(top_builddir)/lnet/ulnds/socklnd/libsocklnd.a
-endif
-
-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