X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=autoMakefile.am;h=2a9976fd2a459fb08f34283d2ebd97ee0b2a6050;hb=362ae805e810f973f2f2b0712148cdb2aa964624;hp=ab75c70e312c5f2e268d1fc94e88873e3b26c96a;hpb=3731004f2fc0dd4c7c24c53fa0e1f79331feb731;p=fs%2Flustre-release.git

diff --git a/autoMakefile.am b/autoMakefile.am
index ab75c70..2a9976f 100644
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -1,7 +1,7 @@
-SUBDIRS := @LDISKFS_SUBDIR@ . @LIBSYSIO_SUBDIR@ @SNMP_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;		     \