X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2FautoMakefile.am.toplevel;h=87b92a1c1534ce5af11eef3355b48693c9e55f4f;hb=f663617bbb811b388fc62ad3c2d430b20c9f5e31;hp=7d984cea40a75118f9708bf0835c31b7be363cc8;hpb=f64af1d45df2a76f97337b47259363f61fab6b5f;p=fs%2Flustre-release.git

diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel
index 7d984ce..87b92a1 100644
--- a/build/autoMakefile.am.toplevel
+++ b/build/autoMakefile.am.toplevel
@@ -1,5 +1,9 @@
-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
 
 # these empty rules are needed so that automake doesn't add its own
 # recursive rules
@@ -15,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
@@ -40,19 +46,28 @@ 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 .svn -o \
+			-name .#* | xargs rm -rf
 
-rpms: dist Makefile
+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