X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=Makefile.in;h=abbd5a84d2356df668e6a651b0920580bfdec92d;hb=ba2b09c52d8d3bd5980d6d16f037a17a8b2c848d;hp=e03fcddc84d69d8c17727f9acd21aeb7d0de4e7a;hpb=83d0b970b2ce11f07e626b8cd7cb6b1c7f13facf;p=tools%2Fe2fsprogs.git diff --git a/Makefile.in b/Makefile.in index e03fcdd..abbd5a8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -10,40 +10,46 @@ INSTALL = @INSTALL@ @RESIZER_CMT@RESIZE_DIR= resize @DEBUGFS_CMT@DEBUGFS_DIR= debugfs -LIB_SUBDIRS=lib/et lib/ss lib/e2p lib/ext2fs lib/uuid # lib/finddev -PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs +LIB_SUBDIRS=lib/et lib/ss lib/e2p lib/ext2fs lib/uuid lib/blkid intl +PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs po SUBDIRS=util $(LIB_SUBDIRS) $(PROG_SUBDIRS) tests -SUBS= lib/ext2fs/ext2_types.h +SUBS= lib/ext2fs/ext2_types.h lib/blkid/blkid_types.h lib/uuid/uuid_types.h TAR=tar -all:: $(SUBS) +all:: subs $(MAKE) libs $(MAKE) progs $(MAKE) docs -progs: $(SUBS) all-progs-recursive -libs: $(SUBS) all-libs-recursive +subs: + @for i in $(SUBS) ; do if test -d `dirname $$i` ; then $(MAKE) $$i ; fi ; done + +progs: subs all-progs-recursive +libs: subs all-libs-recursive docs: - cd doc && $(MAKE) libext2fs.info + -@test -d doc && cd doc && $(MAKE) libext2fs.info install-doc-libs: - cd doc && $(MAKE) install-doc-libs + -@test -d doc && cd doc && $(MAKE) install-doc-libs uninstall-doc-libs: - cd doc && $(MAKE) uninstall-doc-libs + -@test -d doc && cd doc && $(MAKE) uninstall-doc-libs clean-doc: - cd doc && $(MAKE) clean + -@test -d doc && cd doc && $(MAKE) clean distclean-doc: - cd doc && $(MAKE) distclean + -test -d doc && cd doc && $(MAKE) distclean + +install: subs all-libs-recursive install-progs-recursive \ + install-shlibs-libs-recursive install-doc-libs + if test ! -d e2fsck && test ! -d debugfs && test ! -d misc && test ! -d ext2ed ; then $(MAKE) install-libs ; fi -install: $(SUBS) all-libs-recursive install-progs-recursive \ - install-shlibs-libs-recursive install-doc-libs -# export MANPATH=$(DESTDIR)$(mandir); $(srcdir)/install-utils/compile_manpages +install-strip: subs all-libs-recursive install-strip-progs-recursive \ + install-shlibs-strip-libs-recursive install-doc-libs uninstall: uninstall-progs-recursive uninstall-shlibs-libs-recursive uninstall-doc-libs @@ -52,8 +58,8 @@ install-libs: install-libs-recursive uninstall-libs: uninstall-libs-recursive TAGS clean-recursive distclean-recursive depend-recursive check-recursive \ - mostlyclean-recursive realclean-recursive install-recursive: - for subdir in $(SUBDIRS); do \ + mostlyclean-recursive realclean-recursive: + @for subdir in $(SUBDIRS); do \ if test -d $$subdir ; then \ target=`echo $@|$(SED) 's/-recursive//'`; \ echo making $$target in $$subdir; \ @@ -61,8 +67,9 @@ TAGS clean-recursive distclean-recursive depend-recursive check-recursive \ fi ; \ done -all-progs-recursive install-progs-recursive uninstall-progs-recursive: - for subdir in $(PROG_SUBDIRS); do \ +all-progs-recursive install-progs-recursive install-strip-progs-recursive \ + uninstall-progs-recursive: + @for subdir in $(PROG_SUBDIRS); do \ if test -d $$subdir ; then \ target=`echo $@|$(SED) 's/-progs-recursive//'`; \ echo making $$target in $$subdir; \ @@ -70,8 +77,10 @@ all-progs-recursive install-progs-recursive uninstall-progs-recursive: fi ; \ done -all-libs-recursive install-libs-recursive uninstall-libs-recursive install-shlibs-libs-recursive uninstall-shlibs-libs-recursive: - for subdir in $(LIB_SUBDIRS); do \ +all-libs-recursive install-libs-recursive install-strip-libs-recursive \ + uninstall-libs-recursive install-shlibs-libs-recursive \ + install-shlibs-strip-libs-recursive uninstall-shlibs-libs-recursive: + @for subdir in $(LIB_SUBDIRS); do \ if test -d $$subdir ; then \ target=`echo $@|$(SED) 's/-libs-recursive//'`; \ echo making $$target in $$subdir; \ @@ -82,18 +91,30 @@ all-libs-recursive install-libs-recursive uninstall-libs-recursive install-shlib mostlyclean: mostlyclean-recursive mostlyclean-local clean: clean-recursive clean-local clean-doc - $(RM) -f $(SUBS) + $(RM) -f $(SUBS) distclean: distclean-doc distclean-recursive distclean-local + $(RM) -rf autom4te.cache e2fsprogs.spec ext2ed/Makefile po/stamp-po realclean: realclean-recursive realclean-local depend:: depend-recursive lib/ext2fs/ext2_types.h: $(DEP_SUBSTITUTE) $(srcdir)/lib/ext2fs/ext2_types.h.in - $(SUBSTITUTE) $(srcdir)/lib/ext2fs/ext2_types.h.in \ + @echo " SUBST $@" + @$(SUBSTITUTE) $(srcdir)/lib/ext2fs/ext2_types.h.in \ > lib/ext2fs/ext2_types.h +lib/blkid/blkid_types.h: $(DEP_SUBSTITUTE) $(srcdir)/lib/blkid/blkid_types.h.in + @echo " SUBST $@" + @$(SUBSTITUTE) $(srcdir)/lib/blkid/blkid_types.h.in \ + > lib/blkid/blkid_types.h + +lib/uuid/uuid_types.h: $(DEP_SUBSTITUTE) $(srcdir)/lib/uuid/uuid_types.h.in + @echo " SUBST $@" + @$(SUBSTITUTE) $(srcdir)/lib/uuid/uuid_types.h.in \ + > lib/uuid/uuid_types.h + mostlyclean-local: $(RM) -f \#* *~ *.orig core MAKELOG @@ -107,41 +128,5 @@ distclean-local: clean-local realclean-local: distclean-local $(RM) -f configure -check:: $(SUBS) check-recursive - -distribution_tar_file: - $(RM) -rf /tmp/dest - $(MAKE) DESTDIR=/tmp/dest install - 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 \ - > e2fsprogs-@E2FSPROGS_VERSION@-@BINARY_TYPE@.tar.gz - -SRCROOT = `echo e2fsprogs-@E2FSPROGS_VERSION@ | sed -e 's/-WIP//' \ - -e 's/pre-//' -e 's/-PLUS//'` - -$(srcdir)/.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 SCCS \ - -o -name changed-files -o -name .#\* \) \ - -print) | sed -e "s/e2fsprogs/$$a/" > $(srcdir)/.exclude-file - echo "$(SRCROOT)/BitKeeper" >> $(srcdir)/.exclude-file - echo "$(SRCROOT)/build" >> $(srcdir)/.exclude-file - echo "$(SRCROOT)/rpm.log" >> $(srcdir)/.exclude-file - echo "$(SRCROOT)/TODO" >> $(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)/.. && 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 +check:: subs check-recursive +