X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=autoMakefile.am;h=d979a8ef80383ce3a691efa9447817d9281ff2b3;hb=d8bb34d0c1e8c3f768161a1281ee52f8361380bc;hp=0981340a2a8aa31fa76c26c9850a2694e9e8a150;hpb=c3df928cd9f2ff66449954c49ae2ed8a3bcf68d0;p=fs%2Flustre-release.git

diff --git a/autoMakefile.am b/autoMakefile.am
index 0981340..d979a8e 100644
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -1,12 +1,30 @@
+SUBDIRS := @LDISKFS_SUBDIR@ @SPL_SUBDIR@ @ZFS_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
+
 include build/autoMakefile.am.toplevel
 
+EXTRA_DIST += config.h.in
+
+if LDISKFS_ENABLED
+@SYMVERFILE@: @LDISKFS_DIR@/@SYMVERFILE@
+	touch @SYMVERFILE@
+	-grep -v ldiskfs @SYMVERFILE@ > @SYMVERFILE@.old
+	cat @SYMVERFILE@.old @LDISKFS_DIR@/@SYMVERFILE@ > @SYMVERFILE@
+endif
+
 CSTK=/tmp/checkstack
 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;		     \
 		[ -f $$MOD ] && objdump -d $$MOD | perl build/checkstack.pl; \
 	  done;								     \