Branch b1_8

[fs/lustre-release.git] / autoMakefile.am

diff --git a/autoMakefile.am b/autoMakefile.am
index add75e4..2a9976f 100644 (file)
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -1,7 +1,7 @@
-SUBDIRS := @LDISKFS_SUBDIR@ . @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ @LUSTREIOKIT_SUBDIR@ lnet lustre
-DIST_SUBDIRS := @SNMP_DIST_SUBDIR@ libsysio ldiskfs lnet lustre
-SOURCES_SUBDIRS := @LDISKFS_SUBDIR@ lnet lustre
-RPM_SUBDIRS := @LDISKFS_SUBDIR@
+SUBDIRS := @LDISKFS_SUBDIR@ . @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ @LUSTREIOKIT_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre
+DIST_SUBDIRS := @SNMP_DIST_SUBDIR@ libsysio ldiskfs @LUSTREIOKIT_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre 
+SOURCES_SUBDIRS := @LDISKFS_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre
+RPM_SUBDIRS := @LDISKFS_SUBDIR@ @LUSTREIOKIT_SUBDIR@
 if LDISKFS_ENABLED
 EXTRA_SOURCES := @SYMVERFILE@
 endif
@@ -12,7 +12,9 @@ EXTRA_DIST += config.h.in
 
 if LDISKFS_ENABLED
 @SYMVERFILE@: @LDISKFS_DIR@/@SYMVERFILE@
-       cp @LDISKFS_DIR@/@SYMVERFILE@ @SYMVERFILE@
+       touch @SYMVERFILE@
+       -grep -v ldiskfs @SYMVERFILE@ > @SYMVERFILE@.old
+       cat @SYMVERFILE@.old @LDISKFS_DIR@/@SYMVERFILE@ > @SYMVERFILE@
 endif
 
 CSTK=/tmp/checkstack
@@ -20,7 +22,7 @@ CSTKO=/tmp/checkstack.orig
 
 checkstack:
        [ -f ${CSTK} -a ! -s ${CSTKO} ] && mv -f ${CSTK} ${CSTKO} || true
-       { for i in lustre/* lnet/* ; do                                      \
+       { for i in lustre/* lnet/* libcfs/*; do                                      \
                MOD=$$i/`basename $$i`;                                      \
                if [ $$i = "lustre/llite" ]; then MOD=$$i/lustre; fi;        \
                [ -f $$MOD.ko ] && MOD=$$MOD.ko || MOD=$$MOD.o;              \