changes to accomodate new directory names

diff --git a/lustre/Makefile.am b/lustre/Makefile.am
index b84af44..718468b 100644 (file)
--- a/lustre/Makefile.am
+++ b/lustre/Makefile.am
@@ -4,9 +4,8 @@
 # See the file COPYING in this distribution
 
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = rpc llight lib ldlm obdecho mdc osc mds ost utils tests filterobd
-SUBDIRS+= class ext2obd obdfs obdtrace demos doc scripts extN
-#SUBDIRS+= oraid1 rpctarget inofs rpcclient tests snap
+SUBDIRS = ptlrpc llite lib ldlm obdecho mdc osc mds ost utils tests obdfilter
+SUBDIRS+= obdclass obdext2 obdfs demos doc scripts extN
 EXTRA_DIST = BUGS FDL Rules include patches
 
 # We get the version from the spec file.

diff --git a/lustre/configure.in b/lustre/configure.in
index 4a0fde1..1a6a722 100644 (file)
--- a/lustre/configure.in
+++ b/lustre/configure.in
@@ -76,9 +76,9 @@ AC_SUBST(docdir)
 demodir='$(docdir)/demo'
 AC_SUBST(demodir)
 
-AC_OUTPUT(Makefile lib/Makefile ldlm/Makefile obdecho/Makefile rpc/Makefile \
+AC_OUTPUT(Makefile lib/Makefile ldlm/Makefile obdecho/Makefile ptlrpc/Makefile \
        osc/Makefile mdc/Makefile mds/Makefile ost/Makefile utils/Makefile \
-       tests/Makefile filterobd/Makefile class/Makefile ext2obd/Makefile \
-       llight/Makefile obdfs/Makefile obdtrace/Makefile demos/Makefile \
-       snap/Makefile doc/Makefile scripts/Makefile scripts/lustre.spec \
+       tests/Makefile obdfilter/Makefile obdclass/Makefile obdext2/Makefile \
+       llite/Makefile obdfs/Makefile demos/Makefile \
+       doc/Makefile scripts/Makefile scripts/lustre.spec \
        extN/Makefile)