X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2FautoMakefile.am.toplevel;h=aa19a1e403146e19fb7d48ac0b04cf6152617da7;hb=3368b30eba35bdc17a1bd903650b04486d4ab5de;hp=dd87f0eb0e7ea119cd785bef6cf33ebf72934279;hpb=ec31adcd4130b33b14e76ad10e55e6c3a86897cc;p=fs%2Flustre-release.git

diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel
index dd87f0e..aa19a1e 100644
--- a/build/autoMakefile.am.toplevel
+++ b/build/autoMakefile.am.toplevel
@@ -14,22 +14,22 @@ tags-recursive:
 TAGS:
 
 tags:
-	rm -f $(top_srcdir)/TAGS
+	$(RM) $(top_srcdir)/TAGS
 	ETAGSF=`etags --version | grep -iq exuberant && \
 		echo "-I __initdata,__exitdata,EXPORT_SYMBOL"`; \
-	find $(top_srcdir) -name '*.[hc]' |grep -v linux-stage |xargs etags $$ETAGSF -a
+	find $(top_srcdir) -name .pc -prune -o -name '*.[hc]' |xargs etags $$ETAGSF -a
 
-	rm -f $(top_srcdir)/tags
+	$(RM) $(top_srcdir)/tags
 	CTAGSF=`ctags --version | grep -iq exuberant && \
 		echo "-I __initdata,__exitdata,EXPORT_SYMBOL"`; \
-	find $(top_srcdir) -name '*.[hc]' |grep -v linux-stage |xargs ctags $$CTAGSF -a
+	find $(top_srcdir) -name .pc -prune -o -name '*.[hc]' |xargs ctags $$CTAGSF -a
 
 if MODULES
 sources: all-sources
 
-all-sources:
+all-sources: $(EXTRA_SOURCES)
 	for dir in $(SOURCES_SUBDIRS) ; do \
-		$(MAKE) sources -C $$dir ; \
+		$(MAKE) sources -C $$dir || exit $$? ; \
 	done
 
 if LINUX
@@ -51,6 +51,7 @@ endif # !LINUX25
 modules: $(DEP) all-sources
 	$(MAKE) $(ARCH_UM) CC="$(CC)" -C $(LINUX_OBJ)		     \
 	-f $(PWD)/build/Makefile LUSTRE_LINUX_CONFIG=$(LINUX_CONFIG) \
+        LINUXINCLUDE='$(EXTRA_LNET_INCLUDE) -Iinclude $$(if $$(KBUILD_SRC),-Iinclude2 -I$$(srctree)/include) -include include/linux/autoconf.h' \
 	$(MODULE_TARGET)=$(PWD) -o tmp_include_depends -o scripts -o \
 	include/config/MARKER $@
 endif # LINUX
@@ -58,13 +59,15 @@ endif # LINUX
 endif # MODULES
 
 dist-hook:
+	$(RM) $(distdir)/ldiskfs/*.spec
+	$(RM) $(distdir)/lustre-iokit/*.spec
 	find $(distdir) -name .deps -o \
 			-name CVS -o \
 			-name .svn -o \
 			-name .#* | xargs rm -rf
 
 EXTRA_DIST = @PACKAGE_TARNAME@.spec					\
-	build/Makefile build/autoMakefile.toplevel.am build/lbuild	\
+	build/Makefile build/autoMakefile.am.toplevel build/lbuild	\
 	build/linux-merge-config.awk build/linux-merge-modules.awk	\
 	build/linux-rhconfig.h build/lmake build/Rules.in		\
 	build/lustre-kernel-2.4.spec.in build/suse-functions.sh		\
@@ -86,6 +89,7 @@ rpms:
 	for subdir in $(RPM_SUBDIRS) ; do				\
 		echo "Making rpms in $$subdir";				\
 		(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) rpms);		\
+		echo "Finished rpms in $$subdir";			\
 	done;								\
 	$(MAKE) $(AM_MAKEFLAGS) rpms-real
 
@@ -93,6 +97,7 @@ srpm:
 	for subdir in $(RPM_SUBDIRS) ; do				\
 		echo "Making srpm in $$subdir";				\
 		(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) srpm);		\
+		echo "Finished srpms in $$subdir";			\
 	done;								\
 	$(MAKE) $(AM_MAKEFLAGS) srpm-real