X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=autoMakefile.am;h=1b0401381c5dcabd208a8678332756601df2deeb;hp=d40970fa7ba5144105f03d27da556eb68439fccd;hb=5d9275e2784942266f2c9cd03f9ad2f17fba0af4;hpb=0d5cf708f60c1ed9233fd12f4326851ab412ef6a

diff --git a/autoMakefile.am b/autoMakefile.am
index d40970f..1b04013 100644
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -1,35 +1,235 @@
-SUBDIRS := @LDISKFS_SUBDIR@ @SPL_SUBDIR@ @ZFS_SUBDIR@ . @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ @LUSTREIOKIT_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre
-DIST_SUBDIRS := @LDISKFS_DIST_SUBDIR@ @SNMP_DIST_SUBDIR@ libsysio lustre-iokit @LIBCFS_SUBDIR@ lnet lustre
-SOURCES_SUBDIRS := @LDISKFS_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre
-RPM_SUBDIRS := @LDISKFS_SUBDIR@ @LUSTREIOKIT_SUBDIR@
-MODULE_SYMVERS_DEPS = module-symvers
+SUBDIRS := @LDISKFS_SUBDIR@ \
+	. \
+	@LUSTREIOKIT_SUBDIR@ \
+	@LIBCFS_SUBDIR@ \
+	@SNMP_SUBDIR@ \
+	lnet \
+	lustre
 
-@TESTS_TRUE@BUILD_TESTS = true
-@TESTS_FALSE@BUILD_TESTS = false
+DIST_SUBDIRS := ldiskfs \
+	lustre-iokit \
+	@LIBCFS_SUBDIR@ \
+	@SNMP_DIST_SUBDIR@ \
+	lnet \
+	lustre \
+	config
 
-include build/autoMakefile.am.toplevel
+AUTOMAKE_OPTIONS = foreign
 
-EXTRA_DIST += config.h.in
+FIND_TAG_FILES_CMD = find $(top_srcdir) \
+		     -path $(top_srcdir)/ldiskfs/linux-stage \
+		     -prune -false -o -type f -name '*.[hc]'
 
-if USES_DPKG
-EXTRA_DIST += debian/*
-endif
+# these empty rules are needed so that automake doesn't add its own
+# recursive rules
+etags-recursive:
+
+ctags-recursive:
+
+tags-recursive:
+
+TAGS: etags
+
+tags: ctags etags
+
+etags:
+	$(RM) $(top_srcdir)/TAGS
+	ETAGSF=`etags --version | grep -iq exuberant && \
+		echo "-I __initdata,__exitdata,EXPORT_SYMBOL"`; \
+	$(FIND_TAG_FILES_CMD) | xargs etags $$ETAGSF -a
+
+ctags:
+	$(RM) $(top_srcdir)/tags
+	CTAGSF=`ctags --version | grep -iq exuberant && \
+		echo "-I __initdata,__exitdata,EXPORT_SYMBOL"`; \
+	$(FIND_TAG_FILES_CMD) | xargs ctags $$CTAGSF -a
+
+cscope-recursive:
 
-module-symvers-ldiskfs:
+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
+.PHONY: ldiskfs-sources
+
+ldiskfs-sources:
 if LDISKFS_ENABLED
-	@if [ -f @LDISKFS_DIR@/@SYMVERFILE@ ]; then \
-		cat @LDISKFS_DIR@/@SYMVERFILE@ >>@SYMVERFILE@; \
-	elif [ -f @LDISKFS_DIR@/ldiskfs/@SYMVERFILE@ ]; then \
-		cat @LDISKFS_DIR@/ldiskfs/@SYMVERFILE@ >>@SYMVERFILE@; \
-	else \
+	$(MAKE) sources -C @LDISKFS_SUBDIR@ || exit $$?
+endif
+
+if LINUX
+all-am: modules
+
+modules: undef.h ldiskfs-sources
+	$(MAKE) CC="$(CC)" -C $(LINUX_OBJ) \
+	-f $(PWD)/build/Makefile LUSTRE_LINUX_CONFIG=$(LINUX_CONFIG) \
+	LINUXINCLUDE='-I$$(srctree)/arch/$$(SRCARCH)/include -Iarch/$$(SRCARCH)/include/generated -Iinclude $$(if $$(KBUILD_SRC),-Iinclude2 -I$$(srctree)/include) -I$$(srctree)/arch/$$(SRCARCH)/include/uapi -Iarch/$$(SRCARCH)/include/generated/uapi -I$$(srctree)/include/uapi -Iinclude/generated/uapi -include $(CONFIG_INCLUDE)' \
+	$(MODULE_TARGET)=$(PWD) -o tmp_include_depends -o scripts -o \
+	include/config/MARKER $@
+endif # LINUX
+
+endif # MODULES
+
+undef.h: config.h.in
+	grep -v config.h.in config.h.in > $@
+
+dist-hook: undef.h
+	find $(distdir) -name .deps -o \
+			-name CVS -o \
+			-name .svn -o \
+			-name .git -o \
+			-name .#* -exec rm -rf {} \;
+
+EXTRA_DIST = @PACKAGE_TARNAME@.spec	\
+	build/Makefile 			\
+	build/Rules.in			\
+	config.h.in			\
+	undef.h				\
+	lustre-dkms_pre-build.sh	\
+	lustre-dkms_post-build.sh	\
+	LUSTRE-VERSION-GEN		\
+	LUSTRE-VERSION-FILE
+
+# contrib is a directory.  Putting a directory in EXTRA_DIST
+# recursively includes the entire directory contents in the
+# distribution tarball (the tarball created with "make dist").
+EXTRA_DIST += contrib
+
+rpm-local:
+	@(if test -z "$(RPMBUILD)"; then \
 		echo -e "\n" \
-		"*** Missing ldiskfs symbols. Ensure you have built ldiskfs:\n"\
-		"*** - @LDISKFS_OBJ@/ldiskfs/@SYMVERFILE@\n"; \
+	"*** Required util 'rpmbuild' missing. Please install the\n" \
+	"*** package for your distribution which provides 'rpmbuild',\n" \
+	"*** re-run configure, and try again.\n"; \
 		exit 1; \
-	fi
-endif # LDISKFS_ENABLED
+	fi; \
+	$(MKDIR_P) $(rpmbuilddir)/TMP   && \
+	$(MKDIR_P) $(rpmbuilddir)/BUILD && \
+	$(MKDIR_P) $(rpmbuilddir)/RPMS  && \
+	$(MKDIR_P) $(rpmbuilddir)/SRPMS && \
+	$(MKDIR_P) $(rpmbuilddir)/SPECS && \
+	$(MKDIR_P) $(rpmbuilddir)/SOURCES)
+
+if SERVER
+DKMS_PACKAGE=$(PACKAGE)
+DKMS_SERVER=--with servers
+else
+DKMS_PACKAGE=$(PACKAGE)-client
+DKMS_SERVER=--without servers
+endif
+
+# Only zfs Lustre DKMS Server is supported, so previous configure command
+# must use related parameters for success.
+dkms-srpm: $(PACKAGE)-dkms.spec dist Makefile
+	rpmbuilddir=`mktemp -t -d rpmbuild-@PACKAGE@-$$USER-XXXXXXXX`; \
+	$(MAKE) $(AM_MAKEFLAGS) \
+		rpmbuilddir="$$rpmbuilddir" rpm-local || exit 1; \
+	$(RPMBUILD) \
+		--define "_tmppath $$rpmbuilddir/TMP" \
+		--define "_topdir $$rpmbuilddir" \
+		--define "_sourcedir $(top_srcdir)" \
+		$(DKMS_SERVER) \
+		--bs $(PACKAGE)-dkms.spec || exit 1; \
+	cp $$rpmbuilddir/SRPMS/*.src.rpm $(top_srcdir) || exit 1; \
+	rm -rf $$rpmbuilddir
+
+dkms-rpm: dkms-srpm
+	rpmbuilddir=`mktemp -t -d rpmbuild-@PACKAGE@-$$USER-XXXXXXXX`; \
+	$(RPMBUILD) \
+		--define "_tmppath $$rpmbuilddir/TMP" \
+		--define "_topdir $$rpmbuilddir" \
+		@RPMBUILD_BINARY_ARGS@ \
+		--rebuild $(DKMS_PACKAGE)-dkms-*.src.rpm || exit 1; \
+	cp $$rpmbuilddir/RPMS/*/*.rpm $(top_srcdir) || exit 1; \
+	rm -rf $$rpmbuilddir
 
-module-symvers: module-symvers-ldiskfs
+rpms: srpm
+	rpmbuilddir=`mktemp -t -d rpmbuild-@PACKAGE@-$$USER-XXXXXXXX`; \
+	$(MAKE) $(AM_MAKEFLAGS) \
+		rpmbuilddir="$$rpmbuilddir" rpm-local || exit 1; \
+	$(RPMBUILD) \
+		--define "_tmppath $$rpmbuilddir/TMP" \
+		--define "_topdir $$rpmbuilddir" \
+		@RPMBUILD_BINARY_ARGS@ \
+		--rebuild $(distdir)-*.src.rpm || exit 1; \
+	cp $$rpmbuilddir/RPMS/*/*.rpm $(top_srcdir) || exit 1; \
+	rm -rf $$rpmbuilddir
+
+srpm: @PACKAGE_TARNAME@.spec dist Makefile
+	rpmbuilddir=`mktemp -t -d rpmbuild-@PACKAGE@-$$USER-XXXXXXXX`; \
+	$(MAKE) $(AM_MAKEFLAGS) \
+		rpmbuilddir="$$rpmbuilddir" rpm-local || exit 1; \
+	$(RPMBUILD) \
+		--define "_tmppath $$rpmbuilddir/TMP" \
+		--define "_topdir $$rpmbuilddir" \
+		--define "build_src_rpm 1" \
+		--define "dist %{nil}" \
+		-ts $(distdir).tar.gz || exit 1; \
+	cp $$rpmbuilddir/SRPMS/$(distdir)-*.src.rpm $(top_srcdir) || exit 1; \
+	rm -rf $$rpmbuilddir
+
+# In the debs target, first make sure what's in the changelog reflects
+# the software version.
+debs: undef.h
+	lversion=$$(echo @VERSION@ | tr '_' '-'); \
+	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; \
+	rm -rf debs
+	dpkg-buildpackage -I.git -I\*.out[0-9]\* -I\*.swp || { \
+		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 && \
+	pushd 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 && \
+	KVERS=$${KVERS:-$(LINUXRELEASE)} && \
+	if test "x@ENABLEO2IB@" = "xno"; then \
+		export IB_OPTIONS="--with-o2ib=no"; \
+	else \
+		if test -n "@O2IBPATH@"; then \
+			export IB_OPTIONS="--with-o2ib=@O2IBPATH@"; \
+		fi; \
+	fi; \
+	export KSRC_TREE=$(LINUX) && \
+	KSRC=$${KSRC:-$(LINUX_OBJ)} && \
+	m-a build $${KSRC:+-k $$KSRC} $${KVERS:+-l $$KVERS} -i -u $$(pwd) lustre && \
+	popd && \
+	VER=$$(sed -ne '1s/^lustre (\(.*-[0-9][0-9]*\)).*$$/\1/p' debian/changelog) && \
+	mkdir -p debs && \
+	mv ../linux-patch-lustre_$${VER}_all.deb ../lustre-dev_$${VER}_*.deb \
+	   ../lustre-source_$${VER}_all.deb ../lustre-tests_$${VER}_*.deb \
+	   ../lustre-utils_$${VER}_*.deb ../lustre_$${VER}.dsc \
+	   ../lustre_$${VER}_*.changes ../lustre_$${VER}.tar.gz \
+	   ../lustre-client-modules-$${KVERS}_$${VER}_*.deb debs/
+
+if USES_DPKG
+EXTRA_DIST += debian/*
+endif
 
 CSTK=/tmp/checkstack
 CSTKO=/tmp/checkstack.orig
@@ -37,24 +237,12 @@ CSTKO=/tmp/checkstack.orig
 checkstack:
 	[ -f ${CSTK} -a ! -s ${CSTKO} ] && mv -f ${CSTK} ${CSTKO} || true
 	{ for MOD in $$(find . -name "*.ko"); do			     \
-		objdump -d $$MOD | perl build/checkstack.pl;                 \
+		objdump -d $$MOD | perl contrib/scripts/checkstack.pl;	     \
 	  done } | grep -v " bug " | sort -nr | uniq > ${CSTK}
-	[ -f ${CSTKO} ] && ! diff -u ${CSTKO} ${CSTK} || head -30 ${CSTK}
+	[ -f ${CSTKO} ] && ! diff -u ${CSTKO} ${CSTK} || head -n 30 ${CSTK}
 
 checkstack-update:
 	[ -f ${CSTK} ] && mv -f ${CSTK} ${CSTKO}
 
 checkstack-clean:
 	rm -f ${CSTK} ${CSTKO}
-
-module-dist-hook:
-	if [ -d CVS -o -d .git ]; then \
-	    perl lustre/scripts/make_META.pl > $(distdir)/META; \
-	    cp $(distdir)/META $(distdir)/ldiskfs/META; \
-	elif [ -f META ]; then \
-	    cp META $(distdir)/META; \
-	    cp $(distdir)/META $(distdir)/ldiskfs/META; \
-	else \
-	    echo -e "I have no idea how to create a META file in $(distdir).\nPlease file a bug at http://bugzilla.lustre.org/"; \
-	    exit 1; \
-	fi