* landing build diffs from b_release_1_4_7_1

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

diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel
index 2451dd3..bcdd810 100644 (file)
--- a/build/autoMakefile.am.toplevel
+++ b/build/autoMakefile.am.toplevel
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS := . build @LIBSYSIO_SUBDIR@ portals lustre
-DIST_SUBDIRS := build libsysio portals lustre
+SUBDIRS := . build @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ lnet lustre
+DIST_SUBDIRS := build @SNMP_DIST_SUBDIR@ libsysio lnet lustre
 
 EXTRA_DIST := config.h.in
 
@@ -19,16 +19,16 @@ tags:
        rm -f $(top_srcdir)/TAGS
        ETAGSF=`etags --version | grep -iq exuberant && \
                echo "-I __initdata,__exitdata,EXPORT_SYMBOL"`; \
-       find $(top_srcdir) -name '*.[hc]' | xargs etags $$ETAGSF -a
+       find $(top_srcdir) -name '*.[hc]' |grep -v linux-stage |xargs etags $$ETAGSF -a
 
        rm -f $(top_srcdir)/tags
        CTAGSF=`ctags --version | grep -iq exuberant && \
                echo "-I __initdata,__exitdata,EXPORT_SYMBOL"`; \
-       find $(top_srcdir) -name '*.[hc]' | xargs ctags $$CTAGSF -a
+       find $(top_srcdir) -name '*.[hc]' |grep -v linux-stage |xargs ctags $$CTAGSF -a
 
 if MODULES
 all-sources:
-       $(MAKE) sources -C portals
+       $(MAKE) sources -C lnet
        $(MAKE) sources -C lustre
 
 if LINUX
@@ -57,11 +57,16 @@ 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 .svn -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