Add ".#*" to the list of files removed from the make dist target dir.

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

diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel
index 045f722..3413efc 100644 (file)
--- a/build/autoMakefile.am.toplevel
+++ b/build/autoMakefile.am.toplevel
@@ -1,9 +1,7 @@
 AUTOMAKE_OPTIONS = foreign
 
-#SUBDIRS := . build @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ lnet portals lustre
-#DIST_SUBDIRS := build @SNMP_DIST_SUBDIR@ libsysio lnet portals lustre
-SUBDIRS := . build @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ lnet lustre
-DIST_SUBDIRS := build @SNMP_DIST_SUBDIR@ libsysio lnet lustre
+SUBDIRS := . build @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ lnet @LUSTRE_PORTALS_SUBDIR@ lustre
+DIST_SUBDIRS := build @SNMP_DIST_SUBDIR@ libsysio lnet @LUSTRE_PORTALS_SUBDIR@ lustre
 
 EXTRA_DIST := config.h.in
 
@@ -31,8 +29,8 @@ tags:
 if MODULES
 all-sources:
        $(MAKE) sources -C lnet
-#      $(MAKE) sources -C portals
        $(MAKE) sources -C lustre
+       if [ "x@LUSTRE_PORTALS_SUBDIR@" = "xportals" ] ; then $(MAKE) sources -C @LUSTRE_PORTALS_SUBDIR@ ; fi
 
 if LINUX
 all-am: modules
@@ -60,11 +58,15 @@ endif # LINUX
 endif # MODULES
 
 dist-hook:
-       find $(distdir) -name .deps | xargs rm -rf
-       find $(distdir) -name CVS | xargs rm -rf
+       find $(distdir) -name .deps -o \
+                       -name CVS -o \
+                       -name .#* | xargs rm -rf
 
 build/lustre.spec: build/lustre.spec.in config.status
        ./config.status build/lustre.spec
 
 rpms: build/lustre.spec dist Makefile
        rpmbuild -ta $(distdir).tar.gz
+
+srpm: build/lustre.spec dist Makefile
+       rpmbuild -ts $(distdir).tar.gz