LU-12269 build: fix hardened builds in rpm spec file

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

diff --git a/lnet/utils/Makefile.am b/lnet/utils/Makefile.am
index d43150d..fdd0918 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
-# 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,56 +24,36 @@
 # 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 $(UTILS_CFLAGS)
+AM_LDFLAGS := -L. $(UTILS_LDFLAGS)
 
-if BUILD_DLC
 SUBDIRS = lnetconfig
-endif
-
-AM_LDFLAGS := -L$(top_builddir)/lnet/utils/lnetconfig
-
-LIBCFS= $(top_builddir)/libcfs/libcfs/libcfs.a
-LIBCFSUTIL= $(top_builddir)/libcfs/libcfs/libcfsutil.a
 
 if UTILS
-sbin_PROGRAMS = routerstat lst
-
-if BUILD_DLC
-sbin_PROGRAMS += lnetctl
-endif
+sbin_PROGRAMS = routerstat lst lnetctl
 
 routerstat_SOURCES = routerstat.c
+routerstat_LDADD = $(top_builddir)/lnet/utils/lnetconfig/liblnetconfig.la
 
 lst_SOURCES = lst.c
-lst_LDADD = -L. -lptlctl $(LIBCFSUTIL) $(LIBCFS) $(LIBREADLINE) $(LIBEFENCE)
-lst_DEPENDENCIES = libptlctl.a
+lst_LDADD = $(top_builddir)/lnet/utils/lnetconfig/liblnetconfig.la \
+           $(LIBEFENCE)
 
 if TESTS
 sbin_PROGRAMS += wirecheck
 
 wirecheck_SOURCES = wirecheck.c
-endif
+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_LDADD = -L. -lm -lyaml -llnetconfig \
-               $(LIBCFSUTIL) $(LIBCFS) $(LIBREADLINE) $(LIBEFENCE)
-lnetctl_DEPENDENCIES = $(top_builddir)/lnet/utils/lnetconfig/liblnetconfig.so
+lnetctl_SOURCES = lnetctl.c
+lnetctl_LDADD = $(top_builddir)/lnet/utils/lnetconfig/liblnetconfig.la \
+               $(LIBEFENCE)
 endif # UTILS
-
-LND_LIBS =
-if BUILD_USOCKLND
-LND_LIBS += $(top_builddir)/lnet/ulnds/socklnd/libsocklnd.a
-endif
-
-EXTRA_DIST = genlib.sh