X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Futils%2FMakefile.am;h=609a4302894fd34ae14c0f84676f725002a33dbb;hb=316113bbe60da637297a914f336c5f1f81257c6a;hp=925406f9d2f0e2994407a542bcf4a8d6c30424a6;hpb=c658964f36b60ce36e42c88005d5bbb74bf7bc4d;p=fs%2Flustre-release.git

diff --git a/lnet/utils/Makefile.am b/lnet/utils/Makefile.am
index 925406f..609a430 100644
--- a/lnet/utils/Makefile.am
+++ b/lnet/utils/Makefile.am
@@ -3,35 +3,49 @@
 # This code is issued under the GNU General Public License.
 # See the file COPYING in this distribution
 
-COMPILE = $(CC) -Wall -g -I$(srcdir)/../include
-LINK = $(CC) -o $@
+## $(srcdir)/../ for <portals/*.h>, ../../ for generated <config.h>
+#COMPILE = $(CC) -Wall -g -I$(srcdir)/../include -I../../include
+#LINK = $(CC) -o $@
 
 if LIBLUSTRE
-
 noinst_LIBRARIES = libuptlctl.a
-libuptlctl_a_SOURCES = portals.c debug.c l_ioctl.c parser.c parser.h
-libuptlctl_a_CFLAGS = -fPIC
+endif
 
-else
+libuptlctl_a_SOURCES = portals.c debug.c l_ioctl.c
+libuptlctl_a_CPPFLAGS = $(LLCPPFLAGS)
+libuptlctl_a_CFLAGS = $(LLCFLAGS)
+
+sbin_PROGRAMS = debugctl
 
-sbin_PROGRAMS = acceptor ptlctl debugctl routerstat wirecheck gmnalnid
 lib_LIBRARIES = libptlctl.a
 
-acceptor_SOURCES = acceptor.c # -lefence
+libptlctl_a_SOURCES = portals.c debug.c l_ioctl.c parser.c parser.h
 
-wirecheck_SOURCES = wirecheck.c
+if UTILS
+if !CRAY_PORTALS
+sbin_PROGRAMS += acceptor ptlctl routerstat wirecheck 
+endif
+if BUILD_GMNAL
+sbin_PROGRAMS += gmnalnid
+endif
+endif
 
-libptlctl_a_SOURCES = portals.c debug.c l_ioctl.c parser.c parser.h
+acceptor_SOURCES = acceptor.c
+acceptor_LDADD = $(LIBWRAP)
+
+wirecheck_SOURCES = wirecheck.c
 
 gmnalnid_SOURCES = gmnalnid.c
+gmnalnid_CFLAGS = $(GMCPPFLAGS)
+gmnalnid_LDFLAGS = -static
+gmnalnid_LDADD = $(GMLIBS) -lgm
 
 ptlctl_SOURCES = ptlctl.c
 ptlctl_LDADD =  -L. -lptlctl $(LIBREADLINE) $(LIBEFENCE)
 ptlctl_DEPENDENCIES = libptlctl.a
 
+routerstat_SOURCES = routerstat.c
+
 debugctl_SOURCES = debugctl.c
 debugctl_LDADD = -L. -lptlctl $(LIBREADLINE) $(LIBEFENCE)
 debugctl_DEPENDENCIES = libptlctl.a
-
-routerstat_SOURCES = routerstat.c
-endif