X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=build%2FautoMakefile.am.toplevel;h=ba08fc96d36ff291843db035c0e510daad2b9b7a;hp=644a47e03c33baccd584d36266bb341d804f7953;hb=d45b747795bc41f4ef10cb4bc1aa4441c7786c38;hpb=96ab88b14fe7c09da0b70915939713a78d404370

diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel
index 644a47e..ba08fc9 100644
--- a/build/autoMakefile.am.toplevel
+++ b/build/autoMakefile.am.toplevel
@@ -3,6 +3,10 @@
 
 AUTOMAKE_OPTIONS = foreign
 
+FIND_TAG_FILES_CMD = find $(top_srcdir) \
+		     -path $(top_srcdir)/ldiskfs/ldiskfs/linux-stage -prune -false -o\
+		     -type f -name '*.[hc]'
+
 # these empty rules are needed so that automake doesn't add its own
 # recursive rules
 etags-recursive:
@@ -11,25 +15,44 @@ ctags-recursive:
 
 tags-recursive:
 
-TAGS:
+TAGS: etags
+
+tags: ctags etags
 
-tags:
-	rm -f $(top_srcdir)/TAGS
+etags:
+	$(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_TAG_FILES_CMD) | xargs etags $$ETAGSF -a
 
-	rm -f $(top_srcdir)/tags
+ctags:
+	$(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_TAG_FILES_CMD) | xargs ctags $$CTAGSF -a
+
+cscope-recursive:
+
+cscope:
+	$(RM) $(top_srcdir)/cscope*.out $(top_srcdir)/cscope.files
+	$(FIND_TAG_FILES_CMD) > cscope.files
+	cscope -bRq
+
+mkid:
+	$(FIND_TAG_FILES_CMD) | xargs mkid
+
+
+doxygen:  doxygen-api doxygen-ref
+
+doxygen-%: build/doxyfile.%
+	   doxygen $<
 
 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,9 +74,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' 			     \
+        LINUXINCLUDE='$(EXTRA_LNET_INCLUDE) -I$$(srctree)/arch/$$(SRCARCH)/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
@@ -61,34 +82,45 @@ 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 .git -o \
 			-name .#* | xargs rm -rf
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  module-dist-hook
 
 EXTRA_DIST = @PACKAGE_TARNAME@.spec					\
 	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		\
-	build/suse-post.sh build/suse-postun.sh				\
-	build/suse-trigger-script.sh.in build/README.kernel-source	\
-	build/sles8-post.sh build/sles8-postun.sh build/sles8-pre.sh	\
-	build/sles8-update_INITRD_MODULES.sh				\
-	build/sles8-update_rcfile_setting.sh build/update_oldconfig	\
+	build/Rules.in build/README.kernel-source			\
+	build/update_oldconfig						\
 	build/autoconf/lustre-build-linux.m4				\
-	build/autoconf/lustre-build.m4
+	build/autoconf/lustre-build-darwin.m4				\
+	build/autoconf/lustre-build.m4 build/rdac_spec                  \
+	build/mptlinux.spec.patch build/patches
 
 rpms-real: @PACKAGE_TARNAME@.spec dist Makefile
-	rpmbuild -ta $(distdir).tar.gz
+	CONFIGURE_ARGS=$$(echo $$(eval echo $(ac_configure_args)) | sed -re 's/--(en|dis)able-tests//'); \
+	RPMARGS="--define \"configure_args $$CONFIGURE_ARGS\""; \
+	if ! $(BUILD_TESTS); then \
+		RPMARGS="$$RPMARGS --define \"build_lustre_tests 0\""; \
+	fi; \
+	eval rpmbuild $$RPMARGS -ta $(distdir).tar.gz
 
 srpm-real: @PACKAGE_TARNAME@.spec dist Makefile
-	rpmbuild -ts $(distdir).tar.gz
+	if ! $(BUILD_TESTS); then \
+		RPMARGS="--define \"build_lustre_tests 0\""; \
+	fi; \
+	eval rpmbuild $$RPMARGS -ta $(distdir).tar.gz
 
 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
 
@@ -96,6 +128,42 @@ 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
 
+# In the debs target, first make sure what's in the changelog reflects
+# the software version.  Here's how we could dig the version out of the
+# autoconf version file directly:
+# lversion=$$(sed -ne 's/m4_define(\[LUSTRE_[A-Z][A-Z]*\],\[\([0-9][0-9]*\)\])$$/\1/p'
+#	lustre/autoconf/lustre-version.ac | tr '\n' '.' | sed -e 's/.$//');
+#
+# However, one cannot really run "make debs" without having done a
+# configure first, so we could use the easier method of digging the
+# version out of the config.h file.
+debs:
+	lversion=$$(sed -ne 's/^#define VERSION "\(.*\)"$$/\1/p' config.h); \
+	cversion=$$(sed -ne '1s/^lustre (\(.*\)-[0-9][0-9]*).*$$/\1/p' debian/changelog); \
+	if [ "$$lversion" != "$$cversion" ]; then \
+		echo -e "1i\nlustre ($$lversion-1) unstable; urgency=low\n\n  * Automated changelog entry update\n\n -- Brian J. Murrell <brian@interlinx.bc.ca>  $$(date -R)\n\n.\nwq" | ed debian/changelog; \
+	fi
+	dpkg-buildpackage || { \
+		rc=$${PIPESTATUS[0]}; \
+		[ $${rc} -gt 1 ] && exit $${rc}; \
+		exit 0; \
+	}
+	export KPKG_DEST_DIR="$$(pwd)/.." && \
+	version=$$(sed -ne '1s/^lustre (\(.*\)).*$$/\1/p' debian/changelog) && \
+	rm -rf debian/tmp/modules-deb && \
+	mkdir debian/tmp/modules-deb && \
+	cd debian/tmp/modules-deb && \
+	dpkg -x ../../../../lustre-source_$${version}_all.deb $$(pwd) && \
+	mkdir usr_src/ && \
+	tar -C usr_src/ -xjf usr/src/lustre.tar.bz2 && \
+	chmod 755 usr_src/modules/lustre/debian/rules && \
+	mkdir -p usr_share_modass && \
+	ln -s /usr/share/modass/include/ usr_share_modass/ && \
+	ln -s /usr/share/modass/packages/ usr_share_modass/ && \
+	echo "lustre" > usr_share_modass/compliant.list && \
+	export MA_DIR=$$(pwd)/usr_share_modass && \
+	m-a build $${KVERS:+-l $$KVERS} -i -u $$(pwd) lustre