- oops, put _CFLAGS = -fPIC crap in if LIBLUSTRE conditionals. the

  portals/utils instance is commented out until someone can explain why
  (horrible waste of time) automake changes behaviour with it uncommented in
  a !LIBLUSTRE build

diff --git a/lnet/lnet/Makefile.am b/lnet/lnet/Makefile.am
index d1b00e3..083a5ec 100644 (file)
--- a/lnet/lnet/Makefile.am
+++ b/lnet/lnet/Makefile.am
@@ -8,4 +8,7 @@ CPPFLAGS=
 INCLUDES=-I$(top_srcdir)/portals/include -I$(top_srcdir)/include
 lib_LIBRARIES= libportals.a
 libportals_a_SOURCES= api-eq.c api-init.c api-me.c api-errno.c api-ni.c api-wrap.c lib-dispatch.c lib-init.c lib-me.c lib-msg.c lib-eq.c lib-md.c lib-move.c lib-ni.c lib-pid.c
+
+if LIBLUSTRE
 libportals_a_CFLAGS= -fPIC
+endif

diff --git a/lnet/ulnds/Makefile.am b/lnet/ulnds/Makefile.am
index 3cce5ee..bfd7fb2 100644 (file)
--- a/lnet/ulnds/Makefile.am
+++ b/lnet/ulnds/Makefile.am
@@ -3,4 +3,7 @@ INCLUDES=-I$(top_srcdir)/portals/include -I$(top_srcdir)/include -I$(srcdir)
 lib_LIBRARIES = libtcpnal.a
 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

diff --git a/lnet/ulnds/socklnd/Makefile.am b/lnet/ulnds/socklnd/Makefile.am
index 3cce5ee..bfd7fb2 100644 (file)
--- a/lnet/ulnds/socklnd/Makefile.am
+++ b/lnet/ulnds/socklnd/Makefile.am
@@ -3,4 +3,7 @@ INCLUDES=-I$(top_srcdir)/portals/include -I$(top_srcdir)/include -I$(srcdir)
 lib_LIBRARIES = libtcpnal.a
 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

diff --git a/lnet/utils/Makefile.am b/lnet/utils/Makefile.am
index 80eae3e..19b9344 100644 (file)
--- a/lnet/utils/Makefile.am
+++ b/lnet/utils/Makefile.am
@@ -3,12 +3,12 @@
 # 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 $@
 
 if LIBLUSTRE
 tmp=
+#libptlctl_a_CFLAGS = -fPIC
 else
 tmp=gmnalnid
 endif
@@ -21,7 +21,6 @@ acceptor_SOURCES = acceptor.c # -lefence
 wirecheck_SOURCES = wirecheck.c
 
 libptlctl_a_SOURCES = portals.c debug.c l_ioctl.c parser.c parser.h
-libptlctl_a_CFLAGS = -fPIC
 
 gmnalnid_SOURCES = gmnalnid.c
 

diff --git a/lustre/portals/portals/Makefile.am b/lustre/portals/portals/Makefile.am
index d1b00e3..083a5ec 100644 (file)
--- a/lustre/portals/portals/Makefile.am
+++ b/lustre/portals/portals/Makefile.am
@@ -8,4 +8,7 @@ CPPFLAGS=
 INCLUDES=-I$(top_srcdir)/portals/include -I$(top_srcdir)/include
 lib_LIBRARIES= libportals.a
 libportals_a_SOURCES= api-eq.c api-init.c api-me.c api-errno.c api-ni.c api-wrap.c lib-dispatch.c lib-init.c lib-me.c lib-msg.c lib-eq.c lib-md.c lib-move.c lib-ni.c lib-pid.c
+
+if LIBLUSTRE
 libportals_a_CFLAGS= -fPIC
+endif

diff --git a/lustre/portals/unals/Makefile.am b/lustre/portals/unals/Makefile.am
index 3cce5ee..bfd7fb2 100644 (file)
--- a/lustre/portals/unals/Makefile.am
+++ b/lustre/portals/unals/Makefile.am
@@ -3,4 +3,7 @@ INCLUDES=-I$(top_srcdir)/portals/include -I$(top_srcdir)/include -I$(srcdir)
 lib_LIBRARIES = libtcpnal.a
 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

diff --git a/lustre/portals/utils/Makefile.am b/lustre/portals/utils/Makefile.am
index 80eae3e..19b9344 100644 (file)
--- a/lustre/portals/utils/Makefile.am
+++ b/lustre/portals/utils/Makefile.am
@@ -3,12 +3,12 @@
 # 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 $@
 
 if LIBLUSTRE
 tmp=
+#libptlctl_a_CFLAGS = -fPIC
 else
 tmp=gmnalnid
 endif
@@ -21,7 +21,6 @@ acceptor_SOURCES = acceptor.c # -lefence
 wirecheck_SOURCES = wirecheck.c
 
 libptlctl_a_SOURCES = portals.c debug.c l_ioctl.c parser.c parser.h
-libptlctl_a_CFLAGS = -fPIC
 
 gmnalnid_SOURCES = gmnalnid.c