X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=autoMakefile.am;h=1a61ae72dcaa1e3405b668ad8eccb1c5b3c4ecbc;hp=96d3b397900678e88d947e35190de0adce42bec6;hb=807a40c5678109087e2c8759bd86253034804c8d;hpb=666c7580c8a6585479c5eecc316060a19142149d

diff --git a/autoMakefile.am b/autoMakefile.am
index 96d3b39..1a61ae7 100644
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -1,5 +1,18 @@
-SUBDIRS := @LDISKFS_SUBDIR@ . @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ @LUSTREIOKIT_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre
-DIST_SUBDIRS := ldiskfs @SNMP_DIST_SUBDIR@ libsysio lustre-iokit @LIBCFS_SUBDIR@ lnet lustre config contrib
+SUBDIRS := @LDISKFS_SUBDIR@ \
+	. \
+	@SNMP_SUBDIR@ \
+	@LUSTREIOKIT_SUBDIR@ \
+	@LIBCFS_SUBDIR@ \
+	lnet \
+	lustre
+
+DIST_SUBDIRS := ldiskfs \
+	@SNMP_DIST_SUBDIR@ \
+	lustre-iokit \
+	@LIBCFS_SUBDIR@ \
+	lnet \
+	lustre \
+	config contrib
 
 AUTOMAKE_OPTIONS = foreign
 
@@ -64,7 +77,7 @@ all-am: modules
 modules: ldiskfs-sources lustre-sources module-symvers
 	$(MAKE) CC="$(CC)" $(CROSS_VARS) -C $(LINUX_OBJ)	     \
 	-f $(PWD)/build/Makefile LUSTRE_LINUX_CONFIG=$(LINUX_CONFIG) \
-	LINUXINCLUDE='-I$$(srctree)/arch/$$(SRCARCH)/include -I$$(srctree)/arch/$$(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)' \
+	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
@@ -76,10 +89,10 @@ dist-hook:
 			-name CVS -o \
 			-name .svn -o \
 			-name .git -o \
-			-name .#* | xargs rm -rf
+			-name .#* -exec rm -rf {} \;
 	$(MAKE) $(AM_MAKEFLAGS) \
-	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
-	  module-dist-hook
+		top_distdir="$(top_distdir)" distdir="$(distdir)" \
+		module-dist-hook
 
 EXTRA_DIST = @PACKAGE_TARNAME@.spec	\
 	build/Makefile 			\
@@ -127,12 +140,18 @@ debs:
 	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)}; \
-	m-a build $${KVERS:+-l $$KVERS} -i -u $$(pwd) lustre && \
+	KVERS=$${KVERS:-$(LINUXRELEASE)} && \
+	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); \
+	VER=$$(sed -ne '1s/^lustre (\(.*-[0-9][0-9]*\)).*$$/\1/p' debian/changelog) && \
 	mkdir -p debs && \
-	mv ../liblustre_$${VER}_*.deb ../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%-[0-9]*}.orig.tar.gz ../lustre_$${VER}.diff.gz ../lustre-client-modules-$${KVERS}_$${VER}_*.deb 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/
 
 EXTRA_DIST += config.h.in
 
@@ -174,7 +193,7 @@ checkstack:
 	{ for MOD in $$(find . -name "*.ko"); do			     \
 		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}
@@ -183,11 +202,14 @@ checkstack-clean:
 	rm -f ${CSTK} ${CSTKO}
 
 module-dist-hook:
-	if [ -d .git ]; then \
-		perl lustre/scripts/version_tag.pl --make_META > $(distdir)/META; \
+	@if [ -d .git ]; then \
+		perl lustre/scripts/version_tag.pl \
+			--make_META > $(distdir)/META; \
 	elif [ -f META ]; then \
 		cp META $(distdir)/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/"; \
+		echo -e "\n" \
+		"*** I have no idea how to create a META file in $(distdir).\n"\
+		"*** Please file a bug at https://jira.hpdd.intel.com/\n"; \
 		exit 1; \
 	fi