Landing b_hd_newconfig on HEAD

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

diff --git a/lnet/utils/Makefile.am b/lnet/utils/Makefile.am
index a14df1c..9cd3f25 100644 (file)
--- a/lnet/utils/Makefile.am
+++ b/lnet/utils/Makefile.am
@@ -9,34 +9,41 @@
 
 if LIBLUSTRE
 noinst_LIBRARIES = libuptlctl.a
-libuptlctl_a_SOURCES = portals.c debug.c l_ioctl.c
-libuptlctl_a_CPPFLAGS = $(LLCPPFLAGS)
-libuptlctl_a_CFLAGS = $(LLCFLAGS)
 endif
 
+libuptlctl_a_SOURCES = portals.c nidstrings.c debug.c l_ioctl.c
+libuptlctl_a_CPPFLAGS = $(LLCPPFLAGS)
+libuptlctl_a_CFLAGS = $(LLCFLAGS) -DLUSTRE_UTILS=1
+
 sbin_PROGRAMS = debugctl
 
 lib_LIBRARIES = libptlctl.a
 
-libptlctl_a_SOURCES = portals.c debug.c l_ioctl.c parser.c parser.h
-
-if !CRAY_PORTALS
-sbin_PROGRAMS += acceptor ptlctl routerstat wirecheck gmnalnid
+libptlctl_a_SOURCES = portals.c nidstrings.c debug.c l_ioctl.c parser.c parser.h
 
-acceptor_SOURCES = acceptor.c
+if UTILS
+sbin_PROGRAMS += ptlctl routerstat wirecheck 
+if BUILD_GMLND
+sbin_PROGRAMS += gmlndnid
+endif
+endif
 
 wirecheck_SOURCES = wirecheck.c
 
-gmnalnid_SOURCES = gmnalnid.c
+gmlndnid_SOURCES = gmlndnid.c
+gmlndnid_CFLAGS = $(GMCPPFLAGS)
+gmlndnid_LDFLAGS = -static
+gmlndnid_LDADD = $(GMLIBS) -lgm
 
 ptlctl_SOURCES = ptlctl.c
 ptlctl_LDADD =  -L. -lptlctl $(LIBREADLINE) $(LIBEFENCE)
 ptlctl_DEPENDENCIES = libptlctl.a
 
 routerstat_SOURCES = routerstat.c
-endif
 
 debugctl_SOURCES = debugctl.c
 debugctl_LDADD = -L. -lptlctl $(LIBREADLINE) $(LIBEFENCE)
 debugctl_DEPENDENCIES = libptlctl.a
 
+nidstrings.c: @top_srcdir@/lnet/libcfs/nidstrings.c
+       ln -sf $< $@