X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=autoMakefile.am;h=ccf30fc68faf4899ac739d31c52c0106f0a0cad1;hb=d190c63f22c5726c303393fce41e13d2dfccaee4;hp=e65baac8496e58d295778ba9b5d190a53aec7dfc;hpb=b635501547739ba4db2225e7263069a70d4a71cb;p=fs%2Flustre-release.git

diff --git a/autoMakefile.am b/autoMakefile.am
index e65baac..ccf30fc 100644
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -1,10 +1,10 @@
 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 
+DIST_SUBDIRS := @SNMP_DIST_SUBDIR@ libsysio ldiskfs lustre-iokit @LIBCFS_SUBDIR@ lnet lustre 
 SOURCES_SUBDIRS := @LDISKFS_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre
 RPM_SUBDIRS := @LDISKFS_SUBDIR@ @LUSTREIOKIT_SUBDIR@
 if LDISKFS_ENABLED
 if !LDISKFS_IN_KERNEL
-EXTRA_SOURCES := @SYMVERFILE@
+SYMVERFILE_DEPENDECY := @SYMVERFILE@
 endif
 endif
 
@@ -21,6 +21,9 @@ endif
 
 if LDISKFS_ENABLED
 if !LDISKFS_IN_KERNEL
+
+EXTRA_DIST += @SYMVERFILE@
+
 @SYMVERFILE@: @LDISKFS_DIR@/@SYMVERFILE@
 	touch @SYMVERFILE@
 	-grep -v ldiskfs @SYMVERFILE@ > @SYMVERFILE@.old
@@ -55,15 +58,3 @@ module-dist-hook:
 	    echo -e "I have no idea how to create a META file in $(distdir).\nPlease file a bug at http://bugzilla.lustre.org/"; \
 	    exit 1; \
 	fi
-	if [ -d .git ]; then \
-		build/extract_patches $(distdir); \
-		if grep -e "^--- .*\/autoconf" -e "^--- .*\/Makefile\.am" -e ".*\/configure\.ac" -e ".*\/configure\.in" $(distdir)/debian/patches/*; then \
-			cp build/autogen.sh $(distdir)/build; \
-			cp libsysio/autogen.sh $(distdir)/libsysio; \
-			cp lustre-iokit/autogen.sh $(distdir)/lustre-iokit; \
-		fi; \
-		mkdir empty; \
-		diff -urN empty $(distdir)/debian > debian.diff; \
-		rm -rf $(distdir)/debian; \
-		rmdir empty; \
-	fi