landing b_cmobd_merge on HEAD

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

diff --git a/lnet/ulnds/socklnd/Makefile.am b/lnet/ulnds/socklnd/Makefile.am
index 6035ca1..1681250 100644 (file)
--- a/lnet/ulnds/socklnd/Makefile.am
+++ b/lnet/ulnds/socklnd/Makefile.am
@@ -1,9 +1,10 @@
-CPPFLAGS=
-INCLUDES=-I$(top_srcdir)/portals/include -I$(top_srcdir)/include -I$(srcdir)
+if LIBLUSTRE
 noinst_LIBRARIES = libtcpnal.a
+endif
+
+if !CRAY_PORTALS
 pkginclude_HEADERS =  pqtimer.h dispatch.h table.h timer.h connection.h ipmap.h bridge.h procbridge.h
 libtcpnal_a_SOURCES = debug.c pqtimer.c select.c table.c pqtimer.h dispatch.h table.h timer.h address.c procapi.c proclib.c connection.c tcpnal.c connection.h
-
-if LIBLUSTRE
-libtcpnal_a_CFLAGS = -fPIC
-endif
+libtcpnal_a_CPPFLAGS = $(LLCPPFLAGS)
+libtcpnal_a_CFLAGS = $(LLCFLAGS)
+endif
\ No newline at end of file