Phase 1 of LNET Reorg

r=eeb
r=pjk

diff --git a/build/Makefile.in.toplevel b/build/Makefile.in.toplevel
index 7440384..2d6bd50 100644 (file)
--- a/build/Makefile.in.toplevel
+++ b/build/Makefile.in.toplevel
@@ -1,4 +1,5 @@
-subdir-m += portals
+subdir-m += lnet
+#subdir-m += portals
 subdir-m += lustre
 
 @INCLUDE_RULES@

diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel
index 5ecc7d1..045f722 100644 (file)
--- a/build/autoMakefile.am.toplevel
+++ b/build/autoMakefile.am.toplevel
@@ -1,7 +1,9 @@
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS := . build @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ portals lustre
-DIST_SUBDIRS := build @SNMP_DIST_SUBDIR@ libsysio portals lustre
+#SUBDIRS := . build @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ lnet portals lustre
+#DIST_SUBDIRS := build @SNMP_DIST_SUBDIR@ libsysio lnet portals lustre
+SUBDIRS := . build @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ lnet lustre
+DIST_SUBDIRS := build @SNMP_DIST_SUBDIR@ libsysio lnet lustre
 
 EXTRA_DIST := config.h.in
 
@@ -28,7 +30,8 @@ tags:
 
 if MODULES
 all-sources:
-       $(MAKE) sources -C portals
+       $(MAKE) sources -C lnet
+#      $(MAKE) sources -C portals
        $(MAKE) sources -C lustre
 
 if LINUX

diff --git a/build/autoconf/lustre-build-darwin.m4 b/build/autoconf/lustre-build-darwin.m4
index 8b96dfb..91a8a14 100644 (file)
--- a/build/autoconf/lustre-build-darwin.m4
+++ b/build/autoconf/lustre-build-darwin.m4
@@ -93,7 +93,9 @@ AC_SUBST(kextdir)
 AC_SUBST(plistdir)
 AC_SUBST(macosdir)
 
-LP_PROG_DARWIN
+LN_PROG_DARWIN
+
+#LP_PROG_DARWIN
 
 LC_PROG_DARWIN
 ])

diff --git a/build/autoconf/lustre-build-linux.m4 b/build/autoconf/lustre-build-linux.m4
index 03e5501..14895fb 100644 (file)
--- a/build/autoconf/lustre-build-linux.m4
+++ b/build/autoconf/lustre-build-linux.m4
@@ -329,8 +329,11 @@ fi
 
 #LB_LINUX_CONFIG_BIG_STACK
 
+# LNet tests
+LN_PROG_LINUX
+
 # Portals tests
-LP_PROG_LINUX
+#LP_PROG_LINUX
 
 # Lustre tests
 LC_PROG_LINUX

diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4
index 2b3ffe9..f31f543 100644 (file)
--- a/build/autoconf/lustre-build.m4
+++ b/build/autoconf/lustre-build.m4
@@ -356,7 +356,8 @@ AC_SUBST(sysconfdir)
 docdir='${datadir}/doc/$(PACKAGE)'
 AC_SUBST(docdir)
 
-LP_PATH_DEFAULTS
+LN_PATH_DEFAULTS
+#LP_PATH_DEFAULTS
 LC_PATH_DEFAULTS
 ])
 
@@ -415,7 +416,7 @@ AC_TRY_COMPILE([],[],[
        CC="$CC_save"
 ])
 
-CPPFLAGS="-I\$(top_builddir)/portals/include -I\$(top_srcdir)/portals/include -I\$(top_builddir)/lustre/include -I\$(top_srcdir)/lustre/include $CPPFLAGS"
+CPPFLAGS="-I\$(top_builddir)/lnet/include -I\$(top_srcdir)/lnet/include -I\$(top_builddir)/lustre/include -I\$(top_srcdir)/lustre/include $CPPFLAGS"
 
 LLCPPFLAGS="-D__arch_lib__ -D_LARGEFILE64_SOURCE=1"
 AC_SUBST(LLCPPFLAGS)
@@ -423,8 +424,8 @@ AC_SUBST(LLCPPFLAGS)
 LLCFLAGS="-g -Wall -fPIC"
 AC_SUBST(LLCFLAGS)
 
-# everyone builds against portals and lustre
-EXTRA_KCFLAGS="$EXTRA_KCFLAGS -g -I$PWD/portals/include -I$PWD/lustre/include"
+# everyone builds against lnet and lustre
+EXTRA_KCFLAGS="$EXTRA_KCFLAGS -g -I$PWD/lnet/include -I$PWD/lustre/include"
 AC_SUBST(EXTRA_KCFLAGS)
 ])
 
@@ -457,7 +458,8 @@ AC_SUBST(SYSIO)
 LB_LINUX_CONDITIONALS
 LB_DARWIN_CONDITIONALS
 
-LP_CONDITIONALS
+LN_CONDITIONALS
+#LP_CONDITIONALS
 LC_CONDITIONALS
 ])
 
@@ -488,7 +490,8 @@ LB_CONFIG_MODULES
 
 LC_CONFIG_LIBLUSTRE
 
-LP_CONFIGURE
+LN_CONFIGURE
+#LP_CONFIGURE
 LC_CONFIGURE
 if test "$SNMP_DIST_SUBDIR" ; then
        LS_CONFIGURE
@@ -506,7 +509,8 @@ build/Rules
 build/lustre.spec
 ])
 
-LP_CONFIG_FILES
+LN_CONFIG_FILES
+#LP_CONFIG_FILES
 LC_CONFIG_FILES
 if test "$SNMP_DIST_SUBDIR" ; then
        LS_CONFIG_FILES

diff --git a/build/autogen.sh b/build/autogen.sh
index b27e0f9..8ec1324 100644 (file)
--- a/build/autogen.sh
+++ b/build/autogen.sh
@@ -79,7 +79,8 @@ check_version() {
 
 echo "Checking for a complete tree..."
 # required directories
-for dir in build portals lustre ; do
+#for dir in build lnet portals lustre ; do
+for dir in build lnet lustre ; do
     if [ ! -d "$dir" ] ; then
        cat >&2 <<EOF
 Your tree seems to be missing $dir.