LU-12352 libcfs: crashes with certain cpu part numbers

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

diff --git a/lnet/utils/lnetconfig/Makefile.am b/lnet/utils/lnetconfig/Makefile.am
index cb4e980..b14785f 100644 (file)
--- a/lnet/utils/lnetconfig/Makefile.am
+++ b/lnet/utils/lnetconfig/Makefile.am
@@ -19,36 +19,22 @@
 # LGPL HEADER END
 
 #
-# Copyright (c) 2014, Intel Corporation.
+# Copyright (c) 2014, 2017, Intel Corporation.
 #
 
 # Author:
 #   Amir Shehata <amir.shehata@intel.com>
 #
 
-SUBDIRS =
+lib_LTLIBRARIES = liblnetconfig.la
 
-AM_CFLAGS=$(LLCFLAGS)
-AM_CPPFLAGS=$(LLCPPFLAGS) -I$(top_builddir)/lnet/utils \
-                         -I$(top_builddir)/lnet/utils/cyaml \
-                         -DLUSTRE_UTILS=1
-AM_LDFLAGS := -L$(top_builddir)/libcfs/libcfs
-
-lib_LIBRARIES = liblnetconfig.a
-noinst_LIBRARIES = liblnetconfigtmp.a
-
-CYAML := $(top_builddir)/lnet/utils/cyaml/cyaml.c \
-        $(top_builddir)/lnet/utils/cyaml/cyaml.h
-liblnetconfigtmp_a_SOURCES := liblnetconfig.c liblnetconfig.h $(CYAML)
-liblnetconfigtmp_a_CPPFLAGS := $(AM_CPPFLAGS)
-
-# build static and share lib lnet config library
-liblnetconfig.a : liblnetconfigtmp.a
-       rm -f liblnetconfig.a liblnetconfig.so
-       $(CC) $(LDFLAGS) $(AM_LDFLAGS) -shared -o liblnetconfig.so `$(AR) -t liblnetconfigtmp.a`
-       mv liblnetconfigtmp.a liblnetconfig.a
-
-install-exec-hook:
-       cp liblnetconfig.so  $(DESTDIR)$(libdir)/
+liblnetconfig_la_SOURCES  = liblnetconfig.c liblnetconfig.h \
+                           liblnetconfig_lnd.c liblnd.h cyaml.c \
+                           $(top_builddir)/lnet/include/cyaml.h
+liblnetconfig_la_CPPFLAGS = -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 \
+                           -DLUSTRE_UTILS=1 -I$(top_builddir)/lnet/include
+liblnetconfig_la_LDFLAGS = -L$(top_builddir)/libcfs/libcfs -lyaml -lm \
+                          $(LIBREADLINE) -version-info 4:0:0
+liblnetconfig_la_LIBADD = $(top_builddir)/libcfs/libcfs/libcfs.la
 
 EXTRA_DIST =