X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=Makefile.in;h=0e6c35c44365e30f9dc7b8e21c058b777c181997;hb=3030daa8aba89830fb0623be01e507bffd636399;hp=9769bcbf2567e6c0ea1dee0431e863176e01210c;hpb=21c84b71e205b5ab13f14343da5645dcc985856d;p=tools%2Fe2fsprogs.git diff --git a/Makefile.in b/Makefile.in index 9769bcb..0e6c35c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -8,10 +8,10 @@ INSTALL = @INSTALL@ @MCONFIG@ LIB_SUBDIRS=lib/et lib/ss lib/ext2fs lib/e2p lib/uuid -PROG_SUBDIRS=e2fsck debugfs misc tests/progs -SUBDIRS=$(LIB_SUBDIRS) $(PROG_SUBDIRS) tests +PROG_SUBDIRS=e2fsck debugfs misc resize tests/progs +SUBDIRS=util $(LIB_SUBDIRS) $(PROG_SUBDIRS) tests -SUBS= include/linux/types.h +SUBS= include/asm/types.h TAR=tar @@ -21,88 +21,120 @@ progs: $(SUBS) all-progs-recursive libs: $(SUBS) all-libs-recursive docs: - (cd doc; make libext2fs.info) + cd doc && make libext2fs.info install-doc-libs: - (cd doc; make install-doc-libs) + cd doc && make install-doc-libs + +uninstall-doc-libs: + cd doc && make uninstall-doc-libs + +clean-doc: + cd doc && make clean + +distclean-doc: + cd doc && make distclean install: all-libs-recursive install-progs-recursive \ install-shlibs-libs-recursive install-doc-libs - (export MANPATH=$(DESTDIR)$(mandir); $(srcdir)/install-utils/compile_manpages) +# export MANPATH=$(DESTDIR)$(mandir); $(srcdir)/install-utils/compile_manpages + +uninstall: uninstall-progs-recursive uninstall-shlibs-libs-recursive uninstall-doc-libs install-libs: install-libs-recursive -TAGS clean-recursive distclean-recursive \ +uninstall-libs: uninstall-libs-recursive + +TAGS clean-recursive distclean-recursive depend-recursive \ mostlyclean-recursive realclean-recursive install-recursive: for subdir in $(SUBDIRS); do \ - target=`echo $@|$(SED) 's/-recursive//'`; \ - echo making $$target in $$subdir; \ - (cd $$subdir && $(MAKE) $$target) || exit 1; \ + if test -d $$subdir ; then \ + target=`echo $@|$(SED) 's/-recursive//'`; \ + echo making $$target in $$subdir; \ + (cd $$subdir && $(MAKE) $$target) || exit 1; \ + fi ; \ done -all-progs-recursive install-progs-recursive: +all-progs-recursive install-progs-recursive uninstall-progs-recursive: for subdir in $(PROG_SUBDIRS); do \ - target=`echo $@|$(SED) 's/-progs-recursive//'`; \ - echo making $$target in $$subdir; \ - (cd $$subdir && $(MAKE) $$target) || exit 1; \ + if test -d $$subdir ; then \ + target=`echo $@|$(SED) 's/-progs-recursive//'`; \ + echo making $$target in $$subdir; \ + (cd $$subdir && $(MAKE) $$target) || exit 1; \ + fi ; \ done -all-libs-recursive install-libs-recursive install-shlibs-libs-recursive: +all-libs-recursive install-libs-recursive uninstall-libs-recursive install-shlibs-libs-recursive uninstall-shlibs-libs-recursive: for subdir in $(LIB_SUBDIRS); do \ - target=`echo $@|$(SED) 's/-libs-recursive//'`; \ - echo making $$target in $$subdir; \ - (cd $$subdir && $(MAKE) $$target) || exit 1; \ + if test -d $$subdir ; then \ + target=`echo $@|$(SED) 's/-libs-recursive//'`; \ + echo making $$target in $$subdir; \ + (cd $$subdir && $(MAKE) $$target) || exit 1; \ + fi ; \ done mostlyclean: mostlyclean-recursive mostlyclean-local -clean: clean-recursive clean-local +clean: clean-recursive clean-local clean-doc $(RM) -f $(SUBS) -distclean: distclean-recursive distclean-local +distclean: distclean-doc distclean-recursive distclean-local realclean: realclean-recursive realclean-local -include/linux/types.h: $(SUBSTITUTE) $(srcdir)/include/linux/types.h.in - -chmod +x $(SUBSTITUTE) - $(SUBSTITUTE) $(srcdir)/include/linux/types.h.in \ - include/linux/types.h +depend:: depend-recursive + +include/asm/types.h: $(DEP_SUBSTITUTE) $(srcdir)/include/asm/types.h.in + $(SUBSTITUTE) $(srcdir)/include/asm/types.h.in \ + > include/asm/types.h mostlyclean-local: $(RM) -f \#* *~ core MAKELOG + clean-local: mostlyclean-local + distclean-local: clean-local - $(RM) -f include/linux/types.h $(SUBSTITUTE) - $(RM) -f config.status config.log config.cache MCONFIG Makefile + $(RM) -f include/asm/types.h $(SUBST_CONF) \ + config.status config.log config.cache MCONFIG Makefile \ + $(srcdir)/TAGS $(srcdir)/Makefile.in.old + realclean-local: distclean-local $(RM) -f configure check: - (cd tests; make check) + cd tests && make check distribution_tar_file: - rm -rf /tmp/dest + $(RM) -rf /tmp/dest make DESTDIR=/tmp/dest install - cd .. cp -r $(srcdir)/README $(srcdir)/install-utils /tmp/dest + $(RM) -rf /tmp/dest/install-utils/CVS /tmp/dest/install-utils/ChangeLog cp $(srcdir)/INSTALL.@BINARY_TYPE@ /tmp/dest/INSTALL - (cd /tmp/dest; $(TAR) cf - . ) | gzip -9 \ + (cd /tmp/dest && $(TAR) cf - . ) | gzip -9 \ > e2fsprogs-@E2FSPROGS_VERSION@-@BINARY_TYPE@.tar.gz -SRCROOT = `echo e2fsprogs-@E2FSPROGS_VERSION@ | sed -e 's/-WIP//'` +SRCROOT = `echo e2fsprogs-@E2FSPROGS_VERSION@ | sed -e 's/-WIP//' \ + -e 's/pre-//' -e 's/-PLUS//'` $(srcdir)/.exclude-file: - (cd $(srcdir)/.. ; find $(SRCROOT) \( -name \*~ -o -name \*.orig \ - -o -name \*.rej \) -print > $(SRCROOT)/.exclude-file) + a=$(SRCROOT); \ + (cd $(srcdir)/.. && find e2fsprogs \( -name \*~ -o -name \*.orig \ + -o -name CVS -o -name \*.rej -o -name Makefile.pq \ + -o -name TAGS -o -name \*.old -o -name \*.gmo \ + -o -name TODO -o -name changed-files -o -name .#\* \) \ + -print) | sed -e "s/e2fsprogs/$$a/" > $(srcdir)/.exclude-file echo "$(SRCROOT)/build" >> $(srcdir)/.exclude-file echo "$(SRCROOT)/rpm.log" >> $(srcdir)/.exclude-file + echo "$(SRCROOT)/powerquest" >> $(srcdir)/.exclude-file echo "$(SRCROOT)/.exclude-file" >> $(srcdir)/.exclude-file + echo "$(SRCROOT)/po/stamp-cat-id" >> $(srcdir)/.exclude-file + echo "$(SRCROOT)/po/cat-id-tbl.c" >> $(srcdir)/.exclude-file echo $(SRCROOT)/e2fsprogs-@E2FSPROGS_VERSION@.tar.gz \ >> $(srcdir)/.exclude-file - source_tar_file: $(srcdir)/.exclude-file - (cd $(srcdir) ; $(TAR) -C .. -c -v -f - \ - -X .exclude-file $(SRCROOT) | \ - gzip -9 > e2fsprogs-@E2FSPROGS_VERSION@.tar.gz) + cd $(srcdir)/.. && a=$(SRCROOT); rm -f $$a ; ln -sf e2fsprogs $$a ; \ + $(TAR) -c -h -v -f - \ + -X $$a/.exclude-file $$a | \ + gzip -9 > e2fsprogs-@E2FSPROGS_VERSION@.tar.gz rm -f $(srcdir)/.exclude-file