X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=autoMakefile.am;h=27640fb9df5083fa5a26f868c8f31849a19805e8;hp=efd73e7346be572c434c040703194818211db7a9;hb=1d889090f2e2902d861d1fab0227c4343127cc42;hpb=340f512efb21e2a63cd32a824f170854eed8cf56 diff --git a/autoMakefile.am b/autoMakefile.am index efd73e7..27640fb 100644 --- a/autoMakefile.am +++ b/autoMakefile.am @@ -1,16 +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 - -@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 @@ -59,18 +61,23 @@ doxygen-%: build/doxyfile.% doxygen $< if MODULES -sources: all-sources +.PHONY: ldiskfs-sources lustre-sources -all-sources: module-symvers +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 +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) -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 @@ -78,97 +85,25 @@ endif # LINUX endif # MODULES dist-hook: - $(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 + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + module-dist-hook -EXTRA_DIST = @PACKAGE_TARNAME@.spec \ - build/Makefile \ - build/Rules.in +EXTRA_DIST = @PACKAGE_TARNAME@.spec \ + build/Makefile \ + build/Rules.in \ + build/gen_filelist.sh -if ARCH_MIC -EXTRA_DIST += build/gen_filelist.sh -endif +rpms: @PACKAGE_TARNAME@.spec dist Makefile + rpmbuild @RPMBUILD_BINARY_ARGS@ -ta $(distdir).tar.gz -rpms-real: @PACKAGE_TARNAME@.spec dist Makefile - @CONFIGURE_ARGS=""; \ - for arg in $(ac_configure_args); do \ - case $$arg in \ - --with-release=* ) ;; \ - --enable-tests | --disable-tests ) ;; \ - --with-linux=* | --with-linux-obj=* ) ;; \ - * ) CONFIGURE_ARGS="$$CONFIGURE_ARGS '$$arg'" ;; \ - esac; \ - done; \ - RPMARGS="--define \"configure_args $$CONFIGURE_ARGS\""; \ - if [ -n "@LINUX@" ]; then \ - RPMARGS="$$RPMARGS --define \"kdir @LINUX@\""; \ - if [ -n "@LINUX_OBJ@" -a "@LINUX_OBJ@" != "@LINUX@" ]; then \ - RPMARGS="$$RPMARGS --define \"kobjdir @LINUX_OBJ@\""; \ - fi; \ - fi; \ - if [ -n "@CROSS_PATH@" ]; then \ - if [[ "X$(BUILD_SERVER)" = Xtrue ]]; then \ - echo -e "\n" \ - "*** Don't support cross compilation for the Intel(R) Xeon Phi(TM) card.\n"; \ - exit 1; \ - fi; \ - CROSS_SUFFIX="-mic"; \ - RPMARGS="$$RPMARGS --define \"post_script build/gen_filelist.sh\""; \ - RPMARGS="$$RPMARGS --define \"cross_path @CROSS_PATH@\""; \ - RPMARGS="$$RPMARGS --define \"rootdir %{cross_path}\""; \ - RPMARGS="$$RPMARGS --define \"_prefix %{cross_path}/usr\""; \ - RPMARGS="$$RPMARGS --define \"_mandir %{_prefix}/share/man\""; \ - RPMARGS="$$RPMARGS --define \"_sysconfdir %{cross_path}/etc\""; \ - RPMARGS="$$RPMARGS --define \"make_args @CROSS_VARS@\""; \ - if [ -s @LINUX@/../../.ver.build ]; then \ - MPSS_VERSION=$$(sed -ne 's/DRIVERS_\(.*\)-.*/\1/p' @LINUX@/../../.ver.build); \ - if [ -n "$$MPSS_VERSION" ]; then \ - RPMARGS="$$RPMARGS --define \"cross_requires intel-mic-gpl = 2.1.$$MPSS_VERSION\""; \ - fi; \ - fi; \ - fi; \ - if [[ "X$(BUILD_TESTS)" = Xfalse ]]; then \ - RPMARGS="$$RPMARGS --without lustre_tests"; \ - fi; \ - if [[ "X$(BUILD_SERVER)" = Xfalse ]]; then \ - RPMARGS="$$RPMARGS --without servers"; \ - if [ -n "$$CROSS_SUFFIX" ]; then \ - RPMARGS="$$RPMARGS --define \"lustre_name lustre-client$$CROSS_SUFFIX\""; \ - fi; \ - fi; \ - if [[ "X$(BUILD_OSD_LDISKFS)" = Xtrue ]]; then \ - RPMARGS="$$RPMARGS --with ldiskfs"; \ - fi; \ - if [[ "X$(BUILD_OSD_ZFS)" = Xtrue ]]; then \ - RPMARGS="$$RPMARGS --with zfs"; \ - fi; \ - echo "Building Lustre RPM with $$RPMARGS"; \ - eval rpmbuild $$RPMARGS -ta $(distdir).tar.gz - -srpm-real: @PACKAGE_TARNAME@.spec dist Makefile - if [[ "X$(BUILD_TESTS)" = Xfalse ]]; then \ - RPMARGS="--without lustre_tests"; \ - fi; \ - eval rpmbuild $$RPMARGS -ts $(distdir).tar.gz - -rpms: -if BUILD_LUSTREIOKIT - $(MAKE) -C @LUSTREIOKIT_SUBDIR@ $(AM_MAKEFLAGS) $@ -endif - $(MAKE) $(AM_MAKEFLAGS) rpms-real - -srpm: -if BUILD_LUSTREIOKIT - $(MAKE) -C @LUSTREIOKIT_SUBDIR@ $(AM_MAKEFLAGS) $@ -endif - $(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 @@ -210,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 @@ -261,8 +196,8 @@ 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 \