liblustre:

  use noinst_LIBRARIES instead of lib_LIBRARIES for the immediate libraries

diff --git a/lnet/lnet/Makefile.am b/lnet/lnet/Makefile.am
index 083a5ec..d17db61 100644 (file)
--- a/lnet/lnet/Makefile.am
+++ b/lnet/lnet/Makefile.am
@@ -6,7 +6,7 @@
 
 CPPFLAGS=
 INCLUDES=-I$(top_srcdir)/portals/include -I$(top_srcdir)/include
-lib_LIBRARIES= libportals.a
+noinst_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

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

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

diff --git a/lnet/utils/Makefile.am b/lnet/utils/Makefile.am
index 7d49020..6c31b3d 100644 (file)
--- a/lnet/utils/Makefile.am
+++ b/lnet/utils/Makefile.am
@@ -8,7 +8,7 @@ LINK = $(CC) -o $@
 
 if LIBLUSTRE
 
-lib_LIBRARIES = libuptlctl.a
+noinst_LIBRARIES = libuptlctl.a
 libuptlctl_a_SOURCES = portals.c debug.c l_ioctl.c parser.c parser.h
 libuptlctl_a_CFLAGS = -fPIC
 

diff --git a/lustre/portals/portals/Makefile.am b/lustre/portals/portals/Makefile.am
index 083a5ec..d17db61 100644 (file)
--- a/lustre/portals/portals/Makefile.am
+++ b/lustre/portals/portals/Makefile.am
@@ -6,7 +6,7 @@
 
 CPPFLAGS=
 INCLUDES=-I$(top_srcdir)/portals/include -I$(top_srcdir)/include
-lib_LIBRARIES= libportals.a
+noinst_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

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

diff --git a/lustre/portals/utils/Makefile.am b/lustre/portals/utils/Makefile.am
index 7d49020..6c31b3d 100644 (file)
--- a/lustre/portals/utils/Makefile.am
+++ b/lustre/portals/utils/Makefile.am
@@ -8,7 +8,7 @@ LINK = $(CC) -o $@
 
 if LIBLUSTRE
 
-lib_LIBRARIES = libuptlctl.a
+noinst_LIBRARIES = libuptlctl.a
 libuptlctl_a_SOURCES = portals.c debug.c l_ioctl.c parser.c parser.h
 libuptlctl_a_CFLAGS = -fPIC