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 7bb6337..3413efc 100644 (file)
--- a/build/autoMakefile.am.toplevel
+++ b/build/autoMakefile.am.toplevel
@@ -1,5 +1,7 @@
-SUBDIRS := . build @LIBSYSIO_SUBDIR@ portals lustre
-DIST_SUBDIRS := build @LIBSYSIO_SUBDIR@ portals lustre
+AUTOMAKE_OPTIONS = foreign
+
+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
 
@@ -17,19 +19,21 @@ 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-am: modules
-
 all-sources:
-       $(MAKE) sources -C portals
+       $(MAKE) sources -C lnet
        $(MAKE) sources -C lustre
+       if [ "x@LUSTRE_PORTALS_SUBDIR@" = "xportals" ] ; then $(MAKE) sources -C @LUSTRE_PORTALS_SUBDIR@ ; fi
+
+if LINUX
+all-am: modules
 
 if !LINUX25
 DEP = dep
@@ -42,19 +46,27 @@ dep: .depend
        _FASTDEP_ALL_SUB_DIRS="$(PWD)"
 
 CLEANFILES = .depend
-endif
+endif # !LINUX25
 
 modules: $(DEP) all-sources
        $(MAKE) $(ARCH_UM) CC="$(CC)" -C $(LINUX_OBJ)                \
        -f $(PWD)/build/Makefile LUSTRE_LINUX_CONFIG=$(LINUX_CONFIG) \
        $(MODULE_TARGET)=$(PWD) -o tmp_include_depends -o scripts -o \
        include/config/MARKER $@
+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: dist Makefile
+rpms: build/lustre.spec dist Makefile
        rpmbuild -ta $(distdir).tar.gz
+
+srpm: build/lustre.spec dist Makefile
+       rpmbuild -ts $(distdir).tar.gz