X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Futils%2FMakefile.am;h=a51993c049aa3b6293d7a9c57576ac3948dd680d;hp=091f9dac0d7183e8d2a1cd75b6e4f714bd93804d;hb=a34afe7f20ec7d618d3c6a129f0eda3a18972928;hpb=cc95b58e835a7c30bebef2cf930913ac8152997e

diff --git a/lnet/utils/Makefile.am b/lnet/utils/Makefile.am
index 091f9da..a51993c 100644
--- a/lnet/utils/Makefile.am
+++ b/lnet/utils/Makefile.am
@@ -29,33 +29,23 @@
 
 #
 # This file is part of Lustre, http://www.lustre.org/
-# Lustre is a trademark of Sun Microsystems, Inc.
 #
 
-AM_CFLAGS  := -fPIC -D_GNU_SOURCE
-AM_LDFLAGS := -L.
+AM_CFLAGS  := -fPIC -D_GNU_SOURCE $(UTILS_CFLAGS) $(LIBNL3_CFLAGS)
+AM_LDFLAGS := -L. $(UTILS_LDFLAGS)
 
-if BUILD_DLC
 SUBDIRS = lnetconfig
-endif # BUILD_DLC
-
-LIBCFS= $(top_builddir)/libcfs/libcfs/libcfs.a
 
 if UTILS
-sbin_PROGRAMS = routerstat lst
-
-if BUILD_DLC
-sbin_PROGRAMS += lnetctl
-endif # BUILD_DLC
+sbin_PROGRAMS = routerstat lst lnetctl
 
 routerstat_SOURCES = routerstat.c
-routerstat_LDADD = $(LIBCFS)
+routerstat_LDADD = $(top_builddir)/lnet/utils/lnetconfig/liblnetconfig.la
 
 lst_SOURCES = lst.c
-lst_LDADD = $(LIBCFS) $(LIBREADLINE) $(LIBEFENCE)
-if BUILD_DLC
-lst_LDADD += $(top_builddir)/lnet/utils/lnetconfig/liblnetconfig.la
-endif
+lst_CFLAGS = -fPIC -D_LINUX_TIME_H -D_GNU_SOURCE $(LIBNL3_CFLAGS)
+lst_LDADD = $(top_builddir)/lnet/utils/lnetconfig/liblnetconfig.la \
+	    $(LIBEFENCE)
 
 if TESTS
 sbin_PROGRAMS += wirecheck
@@ -65,5 +55,5 @@ endif # TESTS
 
 lnetctl_SOURCES = lnetctl.c
 lnetctl_LDADD = $(top_builddir)/lnet/utils/lnetconfig/liblnetconfig.la \
-		$(LIBCFS) $(LIBREADLINE) $(LIBEFENCE)
+		$(LIBEFENCE)
 endif # UTILS