X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=autoMakefile.am;h=27640fb9df5083fa5a26f868c8f31849a19805e8;hp=79bcd658023691db1f51dafbe1ae2af0fd9a29e1;hb=92b72b7ac85c258f47d6d8f157909a19bd4b724e;hpb=25c93758d6b1136d268fe3fcc1c4979c17463c0b diff --git a/autoMakefile.am b/autoMakefile.am index 79bcd65..27640fb 100644 --- a/autoMakefile.am +++ b/autoMakefile.am @@ -1,35 +1,25 @@ -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 config contrib -SOURCES_SUBDIRS := @LIBCFS_SUBDIR@ lnet lustre -RPM_SUBDIRS := @LDISKFS_SUBDIR@ @LUSTREIOKIT_SUBDIR@ -MODULE_SYMVERS_DEPS = module-symvers - -@TESTS_TRUE@BUILD_TESTS = true -@TESTS_FALSE@BUILD_TESTS = false -@SERVER_TRUE@BUILD_SERVER = true -@SERVER_FALSE@BUILD_SERVER = false -@CLIENT_TRUE@BUILD_CLIENT = true -@CLIENT_FALSE@BUILD_CLIENT = false -@LDISKFS_ENABLED_TRUE@BUILD_OSD_LDISKFS = true -@LDISKFS_ENABLED_FALSE@BUILD_OSD_LDISKFS = false -@ZFS_ENABLED_TRUE@BUILD_OSD_ZFS = true -@ZFS_ENABLED_FALSE@BUILD_OSD_ZFS = false +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 FIND_TAG_FILES_CMD = find $(top_srcdir) \ - -path $(top_srcdir)/ldiskfs/ldiskfs/linux-stage \ + -path $(top_srcdir)/ldiskfs/linux-stage \ -prune -false -o -type f -name '*.[hc]' -MAKEEACHSUBDIR = \ - for subdir in $(RPM_SUBDIRS) ; do \ - echo "Making $@ in $$subdir" ; \ - cd $$subdir ; \ - $(MAKE) $(AM_MAKEFLAGS) $@ ; \ - cd - ; \ - echo "Finished $@ in $$subdir" ; \ - done - # these empty rules are needed so that automake doesn't add its own # recursive rules etags-recursive: @@ -68,23 +58,26 @@ mkid: doxygen: doxygen-api doxygen-ref doxygen-%: build/doxyfile.% - doxygen $< + doxygen $< if MODULES -sources: all-sources +.PHONY: ldiskfs-sources lustre-sources -all-sources: $(MODULE_SYMVERS_DEPS) - for dir in $(SOURCES_SUBDIRS) ; do \ - $(MAKE) sources -C $$dir || exit $$? ; \ - done +ldiskfs-sources: +if LDISKFS_ENABLED + $(MAKE) sources -C @LDISKFS_SUBDIR@ || exit $$? +endif + +lustre-sources: + $(MAKE) sources -C lustre || exit $$? if LINUX all-am: modules -modules: $(DEP) all-sources - $(MAKE) CC="$(CC)" -C $(LINUX_OBJ) \ +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='$(EXTRA_LNET_INCLUDE) -I$$(srctree)/arch/$$(SRCARCH)/include -I$$(srctree)/arch/$$(SRCARCH)/include/generated -Iinclude $$(if $$(KBUILD_SRC),-Iinclude2 -I$$(srctree)/include) -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 @@ -92,65 +85,25 @@ 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 + -name .#* -exec rm -rf {} \; $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" distdir="$(distdir)" \ - module-dist-hook - -EXTRA_DIST = @PACKAGE_TARNAME@.spec \ - build/Makefile \ - build/Rules.in - -rpms-real: @PACKAGE_TARNAME@.spec dist Makefile - CONFIGURE_ARGS=$$(echo $$(eval echo $(ac_configure_args)) | \ - sed -re 's/--(en|dis)able-tests//'); \ - if [ -n "@LINUX@" ]; then \ - CONFIGURE_ARGS=$$(echo $$(eval echo $$CONFIGURE_ARGS) | \ - sed -re 's/--with-linux=[^ ][^ ]*//'); \ - RPMARGS="--define \"kdir @LINUX@\""; \ - CONFIGURE_ARGS=$$(echo $$(eval echo $$CONFIGURE_ARGS) | \ - sed -re 's/--with-linux-obj=[^ ][^ ]*//'); \ - if [ -n "@LINUX_OBJ@" -a "@LINUX_OBJ@" != "@LINUX@" ]; then \ - RPMARGS="$$RPMARGS --define \"kobjdir @LINUX_OBJ@\""; \ - fi; \ - fi; \ - CONFIGURE_ARGS=$$(echo $$(eval echo $$CONFIGURE_ARGS) | \ - sed -re 's/--with-release=[^ ][^ ]*//'); \ - RPMARGS="$$RPMARGS --define \"configure_args $$CONFIGURE_ARGS\""; \ - if [[ "X$(BUILD_TESTS)" = Xfalse ]]; then \ - RPMARGS="$$RPMARGS --define \"build_lustre_tests 0\""; \ - fi; \ - if [[ "X$(BUILD_SERVER)" = Xfalse ]]; then \ - RPMARGS="$$RPMARGS --define \"lustre_name lustre-client\""; \ - fi; \ - if [[ "X$(BUILD_OSD_LDISKFS)" = Xtrue ]]; then \ - RPMARGS="$$RPMARGS --define \"build_lustre_osd_ldiskfs 1\""; \ - fi; \ - if [[ "X$(BUILD_OSD_ZFS)" = Xtrue ]]; then \ - RPMARGS="$$RPMARGS --define \"build_lustre_osd_zfs 1\""; \ - fi; \ - echo "Building Lustre RPM with $$RPMARGS"; \ - eval rpmbuild $$RPMARGS -ta $(distdir).tar.gz + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + module-dist-hook -srpm-real: @PACKAGE_TARNAME@.spec dist Makefile - if [[ "X$(BUILD_TESTS)" = Xfalse ]]; then \ - RPMARGS="--define \"build_lustre_tests 0\""; \ - fi; \ - eval rpmbuild $$RPMARGS -ta $(distdir).tar.gz +EXTRA_DIST = @PACKAGE_TARNAME@.spec \ + build/Makefile \ + build/Rules.in \ + build/gen_filelist.sh -rpms: - @$(MAKEEACHSUBDIR) - $(MAKE) $(AM_MAKEFLAGS) rpms-real +rpms: @PACKAGE_TARNAME@.spec dist Makefile + rpmbuild @RPMBUILD_BINARY_ARGS@ -ta $(distdir).tar.gz -srpm: - @$(MAKEEACHSUBDIR) - $(MAKE) $(AM_MAKEFLAGS) srpm-real +srpm: @PACKAGE_TARNAME@.spec dist Makefile + rpmbuild @RPMBUILD_SOURCE_ARGS@ -ts $(distdir).tar.gz # 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 @@ -192,7 +145,7 @@ debs: popd && \ 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%-[0-9]*}.orig.tar.gz ../lustre_$${VER}.diff.gz ../lustre-client-modules-$${KVERS}_$${VER}_*.deb debs/ EXTRA_DIST += config.h.in @@ -200,20 +153,6 @@ if USES_DPKG EXTRA_DIST += debian/* endif -module-symvers-ldiskfs: -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 \ - echo -e "\n" \ - "*** Missing ldiskfs symbols. Ensure you have built ldiskfs:\n"\ - "*** - @LDISKFS_OBJ@/ldiskfs/@SYMVERFILE@\n"; \ - exit 1; \ - fi -endif # LDISKFS_ENABLED - module-symvers-zfs: if ZFS_ENABLED @if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \ @@ -238,7 +177,7 @@ if ZFS_ENABLED fi endif # ZFS_ENABLED -module-symvers: module-symvers-ldiskfs module-symvers-zfs +module-symvers: module-symvers-zfs CSTK=/tmp/checkstack CSTKO=/tmp/checkstack.orig @@ -257,16 +196,11 @@ checkstack-clean: rm -f ${CSTK} ${CSTKO} module-dist-hook: - if [ -d CVS -o -d .git ]; then \ - perl lustre/scripts/make_META.pl > $(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/"; \ exit 1; \ fi -if LDISKFS_ENABLED - if [ -f $(distdir)/META -a -d $(distdir)/ldiskfs ]; then \ - cp $(distdir)/META $(distdir)/ldiskfs/META; \ - fi -endif