ext2resize-cvs Mailing List for GNU ext2resize (Page 3)
Status: Inactive
Brought to you by:
adilger
You can subscribe to this list here.
2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(7) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2006 |
Jan
|
Feb
(19) |
Mar
|
Apr
|
May
|
Jun
(36) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: Coywolf Qi H. <co...@us...> - 2006-02-17 11:12:43
|
Update of /cvsroot/ext2resize/ext2resize In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8741 Modified Files: Makefile.in aclocal.m4 configure Log Message: Update automake/autoconf bits Index: aclocal.m4 =================================================================== RCS file: /cvsroot/ext2resize/ext2resize/aclocal.m4,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** aclocal.m4 30 Sep 2004 13:58:47 -0000 1.5 --- aclocal.m4 17 Feb 2006 11:12:25 -0000 1.6 *************** *** 1,6 **** ! # aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*- ! # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 ! # Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,6 ---- ! # generated automatically by aclocal 1.9.6 -*- Autoconf -*- ! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, [...1378 lines suppressed...] ! ! # tar/untar a dummy directory, and stop if the command works ! rm -rf conftest.dir ! mkdir conftest.dir ! echo GrepMe > conftest.dir/file ! AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) ! rm -rf conftest.dir ! if test -s conftest.tar; then ! AM_RUN_LOG([$am__untar <conftest.tar]) ! grep GrepMe conftest.dir/file >/dev/null 2>&1 && break ! fi ! done ! rm -rf conftest.dir ! ! AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) ! AC_MSG_RESULT([$am_cv_prog_tar_$1])]) ! AC_SUBST([am__tar]) ! AC_SUBST([am__untar]) ! ]) # _AM_PROG_TAR Index: Makefile.in =================================================================== RCS file: /cvsroot/ext2resize/ext2resize/Makefile.in,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Makefile.in 30 Sep 2004 13:58:47 -0000 1.15 --- Makefile.in 17 Feb 2006 11:12:25 -0000 1.16 *************** *** 1,7 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 ! # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,7 ---- ! # Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ ! # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ! # 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, *************** *** 14,57 **** @SET_MAKE@ - SHELL = @SHELL@ - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . - - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : --- 14,31 ---- @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : *************** *** 60,114 **** PRE_UNINSTALL = : POST_UNINSTALL = : ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ AWK = @AWK@ CC = @CC@ DEPDIR = @DEPDIR@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ STRIP = @STRIP@ VERSION = @VERSION@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ ! SUBDIRS = doc src - subdir = . - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/src/config.h - CONFIG_CLEAN_FILES = - DIST_SOURCES = - - RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ - uninstall-info-recursive all-recursive install-data-recursive \ - install-exec-recursive installdirs-recursive install-recursive \ - uninstall-recursive check-recursive installcheck-recursive - DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ - Makefile.in NEWS THANKS acconfig.h aclocal.m4 configure \ - configure.in depcomp install-sh missing mkinstalldirs - DIST_SUBDIRS = $(SUBDIRS) all: all-recursive .SUFFIXES: ! ! am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ ! configure.lineno ! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) ! $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck - $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) - cd $(srcdir) && $(AUTOCONF) ! $(ACLOCAL_M4): configure.in cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) uninstall-info-am: --- 34,182 ---- PRE_UNINSTALL = : POST_UNINSTALL = : ! subdir = . ! DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ ! $(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \ ! ChangeLog INSTALL NEWS THANKS acconfig.h depcomp install-sh \ ! missing mkinstalldirs ! ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ! am__aclocal_m4_deps = $(top_srcdir)/configure.in ! am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ! $(ACLOCAL_M4) ! am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ ! configure.lineno configure.status.lineno ! mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = $(top_builddir)/src/config.h ! CONFIG_CLEAN_FILES = ! SOURCES = ! DIST_SOURCES = ! RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ! html-recursive info-recursive install-data-recursive \ ! install-exec-recursive install-info-recursive \ ! install-recursive installcheck-recursive installdirs-recursive \ ! pdf-recursive ps-recursive uninstall-info-recursive \ ! uninstall-recursive ! ETAGS = etags ! CTAGS = ctags ! DIST_SUBDIRS = $(SUBDIRS) ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! distdir = $(PACKAGE)-$(VERSION) ! top_distdir = $(distdir) ! am__remove_distdir = \ ! { test ! -d $(distdir) \ ! || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ ! && rm -fr $(distdir); }; } ! DIST_ARCHIVES = $(distdir).tar.gz ! GZIP_ENV = --best ! distuninstallcheck_listfiles = find . -type f -print ! distcleancheck_listfiles = find . -type f -print ! ACLOCAL = @ACLOCAL@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + LDFLAGS = @LDFLAGS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ + am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ + am__tar = @am__tar@ + am__untar = @am__untar@ + bindir = @bindir@ + build_alias = @build_alias@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host_alias = @host_alias@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ ! libdir = @libdir@ ! libexecdir = @libexecdir@ ! localstatedir = @localstatedir@ ! mandir = @mandir@ ! mkdir_p = @mkdir_p@ ! oldincludedir = @oldincludedir@ ! prefix = @prefix@ ! program_transform_name = @program_transform_name@ ! sbindir = @sbindir@ ! sharedstatedir = @sharedstatedir@ ! sysconfdir = @sysconfdir@ ! target_alias = @target_alias@ SUBDIRS = doc src all: all-recursive .SUFFIXES: ! am--refresh: ! @: ! $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ! @for dep in $?; do \ ! case '$(am__configure_deps)' in \ ! *$$dep*) \ ! echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ ! cd $(srcdir) && $(AUTOMAKE) --gnu \ ! && exit 0; \ ! exit 1;; \ ! esac; \ ! done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu Makefile ! .PRECIOUS: Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! @case '$?' in \ ! *config.status*) \ ! echo ' $(SHELL) ./config.status'; \ ! $(SHELL) ./config.status;; \ ! *) \ ! echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ ! cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ ! esac; ! $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck ! $(top_srcdir)/configure: $(am__configure_deps) ! cd $(srcdir) && $(AUTOCONF) ! $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) uninstall-info-am: *************** *** 121,125 **** # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): ! @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ --- 189,199 ---- # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): ! @failcom='exit 1'; \ ! for f in x $$MAKEFLAGS; do \ ! case $$f in \ ! *=* | --[!k]*);; \ ! *k*) failcom='fail=yes';; \ ! esac; \ ! done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ *************** *** 133,137 **** fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ! || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ done; \ if test "$$dot_seen" = "no"; then \ --- 207,211 ---- fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ! || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ *************** *** 141,145 **** mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: ! @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ case "$@" in \ --- 215,225 ---- mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: ! @failcom='exit 1'; \ ! for f in x $$MAKEFLAGS; do \ ! case $$f in \ ! *=* | --[!k]*);; \ ! *k*) failcom='fail=yes';; \ ! esac; \ ! done; \ dot_seen=no; \ case "$@" in \ *************** *** 162,166 **** fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ! || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ done && test -z "$$fail" tags-recursive: --- 242,246 ---- fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ! || eval $$failcom; \ done && test -z "$$fail" tags-recursive: *************** *** 168,176 **** test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done ! ! ETAGS = etags ! ETAGSFLAGS = ! ! tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) --- 248,255 ---- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done ! ctags-recursive: ! list='$(SUBDIRS)'; for subdir in $$list; do \ ! test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ ! done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) *************** *** 182,185 **** --- 261,265 ---- END { for (i in files) print i; }'`; \ mkid -fID $$unique + tags: TAGS TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ *************** *** 187,193 **** tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ ! test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ fi; \ done; \ --- 267,281 ---- tags=; \ here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ ! test ! -f $$subdir/TAGS || \ ! tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ *************** *** 198,203 **** $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! test -z "$(ETAGS_ARGS)$$tags$$unique" \ ! || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ $$tags $$unique --- 286,307 ---- $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ! test -n "$$unique" || unique=$$empty_fix; \ ! $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ! $$tags $$unique; \ ! fi ! ctags: CTAGS ! CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) ! tags=; \ ! here=`pwd`; \ ! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ ! END { for (i in files) print i; }'`; \ ! test -z "$(CTAGS_ARGS)$$tags$$unique" \ ! || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique *************** *** 208,234 **** distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! ! top_distdir = . ! distdir = $(PACKAGE)-$(VERSION) ! ! am__remove_distdir = \ ! { test ! -d $(distdir) \ ! || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ ! && rm -fr $(distdir); }; } ! ! GZIP_ENV = --best ! distcleancheck_listfiles = find . -type f -print distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ ! $(mkinstalldirs) "$(distdir)$$dir"; \ else \ dir=''; \ --- 312,332 ---- distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ ! $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ *************** *** 245,257 **** fi; \ done ! list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ ! test -d $(distdir)/$$subdir \ ! || mkdir $(distdir)/$$subdir \ || exit 1; \ (cd $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="$(top_distdir)" \ ! distdir=../$(distdir)/$$subdir \ distdir) \ || exit 1; \ --- 343,357 ---- fi; \ done ! list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ ! test -d "$(distdir)/$$subdir" \ ! || $(mkdir_p) "$(distdir)/$$subdir" \ || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ (cd $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="$$top_distdir" \ ! distdir="$$distdir/$$subdir" \ distdir) \ || exit 1; \ *************** *** 264,272 **** || chmod -R a+r $(distdir) dist-gzip: distdir ! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) dist dist-all: distdir ! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) --- 364,389 ---- || chmod -R a+r $(distdir) dist-gzip: distdir ! tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ! $(am__remove_distdir) ! ! dist-bzip2: distdir ! tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 ! $(am__remove_distdir) ! ! dist-tarZ: distdir ! tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z ! $(am__remove_distdir) ! ! dist-shar: distdir ! shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz ! $(am__remove_distdir) ! ! dist-zip: distdir ! -rm -f $(distdir).zip ! zip -rq $(distdir).zip $(distdir) $(am__remove_distdir) dist dist-all: distdir ! tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) *************** *** 275,287 **** # tarfile. distcheck: dist ! $(am__remove_distdir) ! GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - chmod -R a-w $(distdir); chmod a+w $(distdir) ! mkdir $(distdir)/=build ! mkdir $(distdir)/=inst chmod a-w $(distdir) ! dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \ ! && cd $(distdir)/=build \ ! && ../configure --srcdir=.. --prefix=$$dc_install_base \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ --- 392,415 ---- # tarfile. distcheck: dist ! case '$(DIST_ARCHIVES)' in \ ! *.tar.gz*) \ ! GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ ! *.tar.bz2*) \ ! bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ ! *.tar.Z*) \ ! uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ ! *.shar.gz*) \ ! GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ ! *.zip*) \ ! unzip $(distdir).zip ;;\ ! esac chmod -R a-w $(distdir); chmod a+w $(distdir) ! mkdir $(distdir)/_build ! mkdir $(distdir)/_inst chmod a-w $(distdir) ! dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ ! && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ ! && cd $(distdir)/_build \ ! && ../configure --srcdir=.. --prefix="$$dc_install_base" \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ *************** *** 291,311 **** && $(MAKE) $(AM_MAKEFLAGS) installcheck \ && $(MAKE) $(AM_MAKEFLAGS) uninstall \ ! && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \ ! || { echo "ERROR: files left after uninstall:" ; \ ! find $$dc_install_base -type f -print ; \ ! exit 1; } >&2 ) \ ! && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ ! && rm -f $(distdir).tar.gz \ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck $(am__remove_distdir) ! @echo "$(distdir).tar.gz is ready for distribution" | \ ! sed 'h;s/./=/g;p;x;p;x' distcleancheck: distclean ! if test '$(srcdir)' = . ; then \ echo "ERROR: distcleancheck can only run from a VPATH build" ; \ exit 1 ; \ fi ! test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ ! || { echo "ERROR: files left after distclean:" ; \ $(distcleancheck_listfiles) ; \ exit 1; } >&2 --- 419,456 ---- && $(MAKE) $(AM_MAKEFLAGS) installcheck \ && $(MAKE) $(AM_MAKEFLAGS) uninstall \ ! && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ ! distuninstallcheck \ ! && chmod -R a-w "$$dc_install_base" \ ! && ({ \ ! (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ ! && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ ! && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ ! && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ ! distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ ! } || { rm -rf "$$dc_destdir"; exit 1; }) \ ! && rm -rf "$$dc_destdir" \ ! && $(MAKE) $(AM_MAKEFLAGS) dist \ ! && rm -rf $(DIST_ARCHIVES) \ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck $(am__remove_distdir) ! @(echo "$(distdir) archives ready for distribution: "; \ ! list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ ! sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' ! distuninstallcheck: ! @cd $(distuninstallcheck_dir) \ ! && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ ! || { echo "ERROR: files left after uninstall:" ; \ ! if test -n "$(DESTDIR)"; then \ ! echo " (check DESTDIR support)"; \ ! fi ; \ ! $(distuninstallcheck_listfiles) ; \ ! exit 1; } >&2 distcleancheck: distclean ! @if test '$(srcdir)' = . ; then \ echo "ERROR: distcleancheck can only run from a VPATH build" ; \ exit 1 ; \ fi ! @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ ! || { echo "ERROR: files left in build directory after distclean:" ; \ $(distcleancheck_listfiles) ; \ exit 1; } >&2 *************** *** 315,319 **** installdirs: installdirs-recursive installdirs-am: - install: install-recursive install-exec: install-exec-recursive --- 460,463 ---- *************** *** 327,331 **** install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install --- 471,475 ---- install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install *************** *** 335,339 **** distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: --- 479,483 ---- distclean-generic: ! -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: *************** *** 346,349 **** --- 490,494 ---- distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-tags *************** *** 352,355 **** --- 497,502 ---- dvi-am: + html: html-recursive + info: info-recursive *************** *** 368,372 **** maintainer-clean: maintainer-clean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) ! -rm -rf autom4te.cache maintainer-clean-am: distclean-am maintainer-clean-generic --- 515,520 ---- maintainer-clean: maintainer-clean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) ! -rm -rf $(top_srcdir)/autom4te.cache ! -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic *************** *** 375,396 **** mostlyclean-am: mostlyclean-generic uninstall-am: uninstall-info-am uninstall-info: uninstall-info-recursive ! .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ ! clean-generic clean-recursive dist dist-all dist-gzip distcheck \ ! distclean distclean-generic distclean-recursive distclean-tags \ ! distcleancheck distdir dvi dvi-am dvi-recursive info info-am \ ! info-recursive install install-am install-data install-data-am \ ! install-data-recursive install-exec install-exec-am \ ! install-exec-recursive install-info install-info-am \ ! install-info-recursive install-man install-recursive \ install-strip installcheck installcheck-am installdirs \ ! installdirs-am installdirs-recursive maintainer-clean \ ! maintainer-clean-generic maintainer-clean-recursive mostlyclean \ ! mostlyclean-generic mostlyclean-recursive tags tags-recursive \ ! uninstall uninstall-am uninstall-info-am \ ! uninstall-info-recursive uninstall-recursive # Tell versions [3.59,3.63) of GNU make to not export all variables. --- 523,551 ---- mostlyclean-am: mostlyclean-generic + pdf: pdf-recursive + + pdf-am: + + ps: ps-recursive + + ps-am: + uninstall-am: uninstall-info-am uninstall-info: uninstall-info-recursive ! .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ ! check-am clean clean-generic clean-recursive ctags \ ! ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \ ! dist-tarZ dist-zip distcheck distclean distclean-generic \ ! distclean-recursive distclean-tags distcleancheck distdir \ ! distuninstallcheck dvi dvi-am html html-am info info-am \ ! install install-am install-data install-data-am install-exec \ ! install-exec-am install-info install-info-am install-man \ install-strip installcheck installcheck-am installdirs \ ! installdirs-am maintainer-clean maintainer-clean-generic \ ! maintainer-clean-recursive mostlyclean mostlyclean-generic \ ! mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ ! uninstall uninstall-am uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. Index: configure =================================================================== RCS file: /cvsroot/ext2resize/ext2resize/configure,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** configure 30 Sep 2004 13:58:47 -0000 1.18 --- configure 17 Feb 2006 11:12:25 -0000 1.19 *************** *** 1,8 **** #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.57. # ! # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 ! # Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. --- 1,7 ---- #! /bin/sh [...3888 lines suppressed...] sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } *************** *** 5860,5867 **** as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ! X"$as_dir" : 'X\(//\)[^/]' \| \ ! X"$as_dir" : 'X\(//\)$' \| \ ! X"$as_dir" : 'X\(/\)' \| \ ! . : '\(.\)' 2>/dev/null || echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } --- 6533,6540 ---- as_dir=`(dirname "$as_dir") 2>/dev/null || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ! X"$as_dir" : 'X\(//\)[^/]' \| \ ! X"$as_dir" : 'X\(//\)$' \| \ ! X"$as_dir" : 'X\(/\)' \| \ ! . : '\(.\)' 2>/dev/null || echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } |
From: Coywolf Qi H. <co...@us...> - 2006-02-17 11:12:41
|
Update of /cvsroot/ext2resize/ext2resize/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8741/doc Modified Files: Makefile.in Log Message: Update automake/autoconf bits Index: Makefile.in =================================================================== RCS file: /cvsroot/ext2resize/ext2resize/doc/Makefile.in,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile.in 30 Sep 2004 13:58:47 -0000 1.7 --- Makefile.in 17 Feb 2006 11:12:25 -0000 1.8 *************** *** 1,7 **** ! # Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 ! # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,7 ---- ! # Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ ! # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ! # 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, *************** *** 14,57 **** @SET_MAKE@ - SHELL = @SHELL@ - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ - AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c - INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) ! transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : --- 14,31 ---- @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : *************** *** 60,106 **** PRE_UNINSTALL = : POST_UNINSTALL = : ! ! EXEEXT = @EXEEXT@ ! OBJEXT = @OBJEXT@ ! PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ AWK = @AWK@ CC = @CC@ DEPDIR = @DEPDIR@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ STRIP = @STRIP@ VERSION = @VERSION@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ ! man_MANS = ext2resize.8 ext2prepare.8 ext2online.8 - EXTRA_DIST = $(man_MANS) - subdir = doc - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/src/config.h - CONFIG_CLEAN_FILES = - DIST_SOURCES = - - NROFF = nroff - MANS = $(man_MANS) - DIST_COMMON = Makefile.am Makefile.in TODO all: all-am .SUFFIXES: ! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu doc/Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ! uninstall-info-am: ! man8dir = $(mandir)/man8 install-man8: $(man8_MANS) $(man_MANS) @$(NORMAL_INSTALL) ! $(mkinstalldirs) $(DESTDIR)$(man8dir) @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ --- 34,164 ---- PRE_UNINSTALL = : POST_UNINSTALL = : ! subdir = doc ! DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in TODO ! ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ! am__aclocal_m4_deps = $(top_srcdir)/configure.in ! am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ! $(ACLOCAL_M4) ! mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = $(top_builddir)/src/config.h ! CONFIG_CLEAN_FILES = ! SOURCES = ! DIST_SOURCES = ! man8dir = $(mandir)/man8 ! am__installdirs = "$(DESTDIR)$(man8dir)" ! NROFF = nroff ! MANS = $(man_MANS) ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! ACLOCAL = @ACLOCAL@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ DEPDIR = @DEPDIR@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + LDFLAGS = @LDFLAGS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_RANLIB = @ac_ct_RANLIB@ + ac_ct_STRIP = @ac_ct_STRIP@ + am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ + am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ + am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ + am__tar = @am__tar@ + am__untar = @am__untar@ + bindir = @bindir@ + build_alias = @build_alias@ + datadir = @datadir@ + exec_prefix = @exec_prefix@ + host_alias = @host_alias@ + includedir = @includedir@ + infodir = @infodir@ install_sh = @install_sh@ ! libdir = @libdir@ ! libexecdir = @libexecdir@ ! localstatedir = @localstatedir@ ! mandir = @mandir@ ! mkdir_p = @mkdir_p@ ! oldincludedir = @oldincludedir@ ! prefix = @prefix@ ! program_transform_name = @program_transform_name@ ! sbindir = @sbindir@ ! sharedstatedir = @sharedstatedir@ ! sysconfdir = @sysconfdir@ ! target_alias = @target_alias@ man_MANS = ext2resize.8 ext2prepare.8 ext2online.8 EXTRA_DIST = $(man_MANS) all: all-am .SUFFIXES: ! $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ! @for dep in $?; do \ ! case '$(am__configure_deps)' in \ ! *$$dep*) \ ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ! && exit 0; \ ! exit 1;; \ ! esac; \ ! done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu doc/Makefile ! .PRECIOUS: Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! @case '$?' in \ ! *config.status*) \ ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ! *) \ ! echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ! esac; ! $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ! ! $(top_srcdir)/configure: $(am__configure_deps) ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ! $(ACLOCAL_M4): $(am__aclocal_m4_deps) ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ! uninstall-info-am: install-man8: $(man8_MANS) $(man_MANS) @$(NORMAL_INSTALL) ! test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)" @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ *************** *** 121,126 **** inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ ! echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \ ! $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \ done uninstall-man8: --- 179,184 ---- inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ ! echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \ ! $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \ done uninstall-man8: *************** *** 135,159 **** for i in $$list; do \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ ! echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \ ! rm -f $(DESTDIR)$(man8dir)/$$inst; \ done tags: TAGS TAGS: ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - top_distdir = .. - distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ ! $(mkinstalldirs) "$(distdir)$$dir"; \ else \ dir=''; \ --- 193,226 ---- for i in $$list; do \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ ! echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \ ! rm -f "$(DESTDIR)$(man8dir)/$$inst"; \ done tags: TAGS TAGS: ! ctags: CTAGS ! CTAGS: distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ ! $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ *************** *** 173,180 **** check: check-am all-am: Makefile $(MANS) - installdirs: ! $(mkinstalldirs) $(DESTDIR)$(man8dir) ! install: install-am install-exec: install-exec-am --- 240,247 ---- check: check-am all-am: Makefile $(MANS) installdirs: ! for dir in "$(DESTDIR)$(man8dir)"; do \ ! test -z "$$dir" || $(mkdir_p) "$$dir"; \ ! done install: install-am install-exec: install-exec-am *************** *** 188,192 **** install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install --- 255,259 ---- install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install *************** *** 196,200 **** distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: --- 263,267 ---- distclean-generic: ! -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: *************** *** 206,210 **** distclean: distclean-am ! distclean-am: clean-am distclean-generic --- 273,277 ---- distclean: distclean-am ! -rm -f Makefile distclean-am: clean-am distclean-generic *************** *** 213,216 **** --- 280,285 ---- dvi-am: + html: html-am + info: info-am *************** *** 228,232 **** maintainer-clean: maintainer-clean-am ! maintainer-clean-am: distclean-am maintainer-clean-generic --- 297,301 ---- maintainer-clean: maintainer-clean-am ! -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic *************** *** 235,238 **** --- 304,315 ---- mostlyclean-am: mostlyclean-generic + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-info-am uninstall-man *************** *** 240,250 **** .PHONY: all all-am check check-am clean clean-generic distclean \ ! distclean-generic distdir dvi dvi-am info info-am install \ ! install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am install-man \ install-man8 install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ ! mostlyclean mostlyclean-generic uninstall uninstall-am \ ! uninstall-info-am uninstall-man uninstall-man8 # Tell versions [3.59,3.63) of GNU make to not export all variables. --- 317,327 ---- .PHONY: all all-am check check-am clean clean-generic distclean \ ! distclean-generic distdir dvi dvi-am html html-am info info-am \ ! install install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am install-man \ install-man8 install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ ! mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \ ! uninstall-am uninstall-info-am uninstall-man uninstall-man8 # Tell versions [3.59,3.63) of GNU make to not export all variables. |
From: Coywolf Qi H. <co...@us...> - 2006-02-17 05:31:30
|
Update of /cvsroot/ext2resize/ext2resize/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12168 Modified Files: ext2_inode_relocator.c Log Message: some s/foobar/foo_bar renamings in struct ext2_inode_relocator_state Index: ext2_inode_relocator.c =================================================================== RCS file: /cvsroot/ext2resize/ext2resize/src/ext2_inode_relocator.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** ext2_inode_relocator.c 30 Sep 2004 14:01:41 -0000 1.16 --- ext2_inode_relocator.c 17 Feb 2006 05:31:25 -0000 1.17 *************** *** 49,54 **** struct ext2_inode_relocator_state { ! int usedentries; ! int resolvedentries; struct ext2_inode_entry *inode; struct ext2_reference *last; --- 49,54 ---- struct ext2_inode_relocator_state { ! int used_entries; ! int resolved_entries; struct ext2_inode_entry *inode; struct ext2_reference *last; *************** *** 68,72 **** blk_t tval; ! max_e = state->usedentries - 1; min_e = 0; retv = NULL; --- 68,72 ---- blk_t tval; ! max_e = state->used_entries - 1; min_e = 0; retv = NULL; *************** *** 119,123 **** if (i == ent->numreferences - 1) ! state->resolvedentries++; ent->ref[i].block = blockno; --- 119,123 ---- if (i == ent->numreferences - 1) ! state->resolved_entries++; ent->ref[i].block = blockno; *************** *** 240,244 **** } ! static int doscangroup(struct ext2_fs *fs, struct ext2_inode_relocator_state *state, int group) { --- 240,244 ---- } ! static int do_scan_group(struct ext2_fs *fs, struct ext2_inode_relocator_state *state, int group) { *************** *** 260,264 **** } ! if (state->resolvedentries == state->usedentries) break; } --- 260,264 ---- } ! if (state->resolved_entries == state->used_entries) break; } *************** *** 268,289 **** if (fs->flags & FL_VERBOSE) printf("%i/%i inodes resolved\r", ! state->resolvedentries, state->usedentries); return 1; } ! static int doscan(struct ext2_fs *fs, struct ext2_inode_relocator_state *state) { int i; ! if (!doscangroup(fs, state, 0)) return 0; ! if (state->resolvedentries != state->usedentries) for (i = fs->numgroups - 1; i > 0; i--) { ! if (!doscangroup(fs, state, i)) return 0; ! if (state->resolvedentries == state->usedentries) break; } --- 268,289 ---- if (fs->flags & FL_VERBOSE) printf("%i/%i inodes resolved\r", ! state->resolved_entries, state->used_entries); return 1; } ! static int do_scan(struct ext2_fs *fs, struct ext2_inode_relocator_state *state) { int i; ! if (!do_scan_group(fs, state, 0)) return 0; ! if (state->resolved_entries != state->used_entries) for (i = fs->numgroups - 1; i > 0; i--) { ! if (!do_scan_group(fs, state, i)) return 0; ! if (state->resolved_entries == state->used_entries) break; } *************** *** 306,310 **** int i; ! for (i = 0; i < state->usedentries; i++) { struct ext2_inode inode; struct ext2_inode_entry *entry; --- 306,310 ---- int i; ! for (i = 0; i < state->used_entries; i++) { struct ext2_inode inode; struct ext2_inode_entry *entry; *************** *** 331,335 **** int i; ! for (i = 0; i < state->usedentries; i++) { struct ext2_inode_entry *entry; --- 331,335 ---- int i; ! for (i = 0; i < state->used_entries; i++) { struct ext2_inode_entry *entry; *************** *** 350,354 **** static int numerrors = 0; ! for (i = 0; i < state->usedentries; i++) { struct ext2_inode_entry *entry; int j; --- 350,354 ---- static int numerrors = 0; ! for (i = 0; i < state->used_entries; i++) { struct ext2_inode_entry *entry; int j; *************** *** 428,432 **** state->inode[ptr++].dest = offset + j; ! if (ptr == state->usedentries) { ext2_brelse(bh, 0); return 1; --- 428,432 ---- state->inode[ptr++].dest = offset + j; ! if (ptr == state->used_entries) { ext2_brelse(bh, 0); return 1; *************** *** 446,453 **** struct ext2_inode_relocator_state *state) { ! if (!state->usedentries) return 1; ! if (!doscan(fs, state)) return 0; --- 446,453 ---- struct ext2_inode_relocator_state *state) { ! if (!state->used_entries) return 1; ! if (!do_scan(fs, state)) return 0; *************** *** 459,464 **** ext2_inode_relocator_finish(fs, state); ! state->usedentries = 0; ! state->resolvedentries = 0; state->last = (struct ext2_reference *)fs->relocator_pool_end; --- 459,464 ---- ext2_inode_relocator_finish(fs, state); ! state->used_entries = 0; ! state->resolved_entries = 0; state->last = (struct ext2_reference *)fs->relocator_pool_end; *************** *** 481,485 **** ext2_read_inode(fs, ino, &inode); ! adv = state->inode + state->usedentries + 1; rec = state->last - inode.i_links_count; --- 481,485 ---- ext2_read_inode(fs, ino, &inode); ! adv = state->inode + state->used_entries + 1; rec = state->last - inode.i_links_count; *************** *** 489,493 **** state->last -= inode.i_links_count; ! ent = &state->inode[state->usedentries]; ent->ino = ino; ent->dest = 0; --- 489,493 ---- state->last -= inode.i_links_count; ! ent = &state->inode[state->used_entries]; ent->ino = ino; ent->dest = 0; *************** *** 500,504 **** } ! state->usedentries++; return 1; --- 500,504 ---- } ! state->used_entries++; return 1; *************** *** 514,519 **** printf("%s\n", __FUNCTION__); ! state.usedentries = 0; ! state.resolvedentries = 0; state.inode = (struct ext2_inode_entry *)fs->relocator_pool; state.last = (struct ext2_reference *)fs->relocator_pool_end; --- 514,519 ---- printf("%s\n", __FUNCTION__); ! state.used_entries = 0; ! state.resolved_entries = 0; state.inode = (struct ext2_inode_entry *)fs->relocator_pool; state.last = (struct ext2_reference *)fs->relocator_pool_end; |
From: Coywolf Qi H. <co...@us...> - 2006-02-17 05:27:26
|
Update of /cvsroot/ext2resize/ext2resize/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9415 Modified Files: ext2_block_relocator.c Log Message: some s/%d/%lu/ and tidy Index: ext2_block_relocator.c =================================================================== RCS file: /cvsroot/ext2resize/ext2resize/src/ext2_block_relocator.c,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** ext2_block_relocator.c 14 Feb 2006 07:02:06 -0000 1.21 --- ext2_block_relocator.c 17 Feb 2006 05:27:16 -0000 1.22 *************** *** 105,109 **** } ! struct ext2_block_entry *findit(struct ext2_block_relocator_state *state, blk_t block) { int min_e; --- 105,110 ---- } ! struct ext2_block_entry *findit(struct ext2_block_relocator_state *state, ! blk_t block) { int min_e; *************** *** 645,650 **** state->new_alloc_offset = newitoffset + fs->inodeblocks; if (fs->flags & FL_DEBUG) ! printf("moving data (oldgdblocks %d+%d, newgdblocks %d, " ! "olditoffset %d, newitoffset %d, new_alloc_offset %d)\n", fs->gdblocks, fs->resgdblocks, fs->newgdblocks, fs->itoffset, newitoffset, state->new_alloc_offset); --- 646,651 ---- state->new_alloc_offset = newitoffset + fs->inodeblocks; if (fs->flags & FL_DEBUG) ! printf("moving data (oldgdblocks %lu+%lu, newgdblocks %lu, " ! "olditoffset %d, newitoffset %d, new_alloc_offset %lu)\n", fs->gdblocks, fs->resgdblocks, fs->newgdblocks, fs->itoffset, newitoffset, state->new_alloc_offset); *************** *** 786,789 **** --- 787,791 ---- if (inode->i_mtime) ext2_write_inode(fs, EXT2_RESIZE_INO, inode); + return ext2_block_relocator_flush(fs, state); } *************** *** 915,919 **** state.new_alloc_offset = 0; state.alloc_entries = (ext2_relocator_pool_size << 10) / ! sizeof(struct ext2_block_entry); state.used_entries = 0; state.resolved_entries = 0; --- 917,921 ---- state.new_alloc_offset = 0; state.alloc_entries = (ext2_relocator_pool_size << 10) / ! sizeof(struct ext2_block_entry); state.used_entries = 0; state.resolved_entries = 0; |
From: Coywolf Qi H. <co...@us...> - 2006-02-14 07:02:15
|
Update of /cvsroot/ext2resize/ext2resize/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv329/src Modified Files: ext2_block_relocator.c Log Message: I can't stand with these bad names. So do some s/foobar/foo_bar renamings. Index: ext2_block_relocator.c =================================================================== RCS file: /cvsroot/ext2resize/ext2resize/src/ext2_block_relocator.c,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** ext2_block_relocator.c 30 Sep 2004 14:05:55 -0000 1.20 --- ext2_block_relocator.c 14 Feb 2006 07:02:06 -0000 1.21 *************** *** 40,47 **** struct ext2_block_relocator_state { ! blk_t newallocoffset; ! blk_t allocentries; ! blk_t usedentries; ! blk_t resolvedentries; struct ext2_block_entry *block; --- 40,47 ---- struct ext2_block_relocator_state { ! blk_t new_alloc_offset; ! blk_t alloc_entries; ! blk_t used_entries; ! blk_t resolved_entries; struct ext2_block_entry *block; *************** *** 113,117 **** blk_t tval; ! max_e = state->usedentries - 1; min_e = 0; retv = NULL; --- 113,117 ---- blk_t tval; ! max_e = state->used_entries - 1; min_e = 0; retv = NULL; *************** *** 157,161 **** ent->isindirectblock = indirect; ! state->resolvedentries++; state->start[indirect].num++; --- 157,161 ---- ent->isindirectblock = indirect; ! state->resolved_entries++; state->start[indirect].num++; *************** *** 325,329 **** } ! if (state->resolvedentries == state->usedentries) break; } --- 325,329 ---- } ! if (state->resolved_entries == state->used_entries) break; } *************** *** 333,342 **** if (fs->flags & FL_VERBOSE) { printf("%i/%i blocks resolved\r", ! state->resolvedentries, ! state->usedentries); fflush(stdout); } ! if (state->resolvedentries == state->usedentries) break; } --- 333,342 ---- if (fs->flags & FL_VERBOSE) { printf("%i/%i blocks resolved\r", ! state->resolved_entries, ! state->used_entries); fflush(stdout); } ! if (state->resolved_entries == state->used_entries) break; } *************** *** 350,354 **** state->start[0].dst = state->start[1].dst + state->start[1].num; ! return (state->resolvedentries == state->usedentries); } --- 350,354 ---- state->start[0].dst = state->start[1].dst + state->start[1].num; ! return (state->resolved_entries == state->used_entries); } *************** *** 368,372 **** struct ext2_block_entry *ptr; ! numleft = state->usedentries; ptr = state->block; while (numleft && ret) { --- 368,372 ---- struct ext2_block_entry *ptr; ! numleft = state->used_entries; ptr = state->block; while (numleft && ret) { *************** *** 391,396 **** if (fs->flags & FL_VERBOSE) { printf("copied %i/%i blocks\r", ! state->usedentries - numleft, ! state->usedentries); fflush(stdout); } --- 391,396 ---- if (fs->flags & FL_VERBOSE) { printf("copied %i/%i blocks\r", ! state->used_entries - numleft, ! state->used_entries); fflush(stdout); } *************** *** 408,412 **** int ret = 1; ! for (i = 0; i < state->usedentries && ret; i++) { struct ext2_block_entry *block; --- 408,412 ---- int ret = 1; ! for (i = 0; i < state->used_entries && ret; i++) { struct ext2_block_entry *block; *************** *** 495,499 **** int bpg; int raid_bb, raid_ib; ! int itend = state->newallocoffset; bpg = fs->sb.s_blocks_per_group; --- 495,499 ---- int bpg; int raid_bb, raid_ib; ! int itend = state->new_alloc_offset; bpg = fs->sb.s_blocks_per_group; *************** *** 515,519 **** state->block[ptr++].dest = start + j; ! if (ptr == state->usedentries) { ext2_brelse(bh, 0); return 1; --- 515,519 ---- state->block[ptr++].dest = start + j; ! if (ptr == state->used_entries) { ext2_brelse(bh, 0); return 1; *************** *** 535,539 **** int i; ! if (!state->usedentries) return 1; --- 535,539 ---- int i; ! if (!state->used_entries) return 1; *************** *** 541,545 **** printf("%s\n", __FUNCTION__); ! qsort(state->block, state->usedentries, sizeof(struct ext2_block_entry), compare_block_entries); --- 541,545 ---- printf("%s\n", __FUNCTION__); ! qsort(state->block, state->used_entries, sizeof(struct ext2_block_entry), compare_block_entries); *************** *** 552,556 **** ext2_block_relocator_copy(fs, state); ! qsort(state->block, state->usedentries, sizeof(struct ext2_block_entry), compare_block_entries_ind); --- 552,556 ---- ext2_block_relocator_copy(fs, state); ! qsort(state->block, state->used_entries, sizeof(struct ext2_block_entry), compare_block_entries_ind); *************** *** 586,591 **** } ! state->usedentries = 0; ! state->resolvedentries = 0; return 1; --- 586,591 ---- } ! state->used_entries = 0; ! state->resolved_entries = 0; return 1; *************** *** 611,619 **** } ! if (state->usedentries == state->allocentries - 1) if (!ext2_block_relocator_flush(fs, state)) return 0; ! i = state->usedentries; state->block[i].num = block; state->block[i].dest = 0; --- 611,619 ---- } ! if (state->used_entries == state->alloc_entries - 1) if (!ext2_block_relocator_flush(fs, state)) return 0; ! i = state->used_entries; state->block[i].num = block; state->block[i].dest = 0; *************** *** 621,625 **** state->block[i].refoffset = 0; ! state->usedentries++; return 1; } --- 621,625 ---- state->block[i].refoffset = 0; ! state->used_entries++; return 1; } *************** *** 643,652 **** ext2_read_inode(fs, EXT2_RESIZE_INO, inode); inode->i_mtime = 0; ! state->newallocoffset = newitoffset + fs->inodeblocks; if (fs->flags & FL_DEBUG) printf("moving data (oldgdblocks %d+%d, newgdblocks %d, " ! "olditoffset %d, newitoffset %d, newallocoffset %d)\n", fs->gdblocks, fs->resgdblocks, fs->newgdblocks, ! fs->itoffset, newitoffset, state->newallocoffset); for (group = 0, start = fs->sb.s_first_data_block; --- 643,652 ---- ext2_read_inode(fs, EXT2_RESIZE_INO, inode); inode->i_mtime = 0; ! state->new_alloc_offset = newitoffset + fs->inodeblocks; if (fs->flags & FL_DEBUG) printf("moving data (oldgdblocks %d+%d, newgdblocks %d, " ! "olditoffset %d, newitoffset %d, new_alloc_offset %d)\n", fs->gdblocks, fs->resgdblocks, fs->newgdblocks, ! fs->itoffset, newitoffset, state->new_alloc_offset); for (group = 0, start = fs->sb.s_first_data_block; *************** *** 800,804 **** printf("%s\n", __FUNCTION__); ! state->newallocoffset = fs->itoffset + fs->inodeblocks; ext2_read_inode(fs, EXT2_RESIZE_INO, inode); inode->i_mtime = 0; --- 800,804 ---- printf("%s\n", __FUNCTION__); ! state->new_alloc_offset = fs->itoffset + fs->inodeblocks; ext2_read_inode(fs, EXT2_RESIZE_INO, inode); inode->i_mtime = 0; *************** *** 913,921 **** printf("relocating blocks....\n"); ! state.newallocoffset = 0; ! state.allocentries = (ext2_relocator_pool_size << 10) / sizeof(struct ext2_block_entry); ! state.usedentries = 0; ! state.resolvedentries = 0; state.block = (struct ext2_block_entry *)fs->relocator_pool; --- 913,921 ---- printf("relocating blocks....\n"); ! state.new_alloc_offset = 0; ! state.alloc_entries = (ext2_relocator_pool_size << 10) / sizeof(struct ext2_block_entry); ! state.used_entries = 0; ! state.resolved_entries = 0; state.block = (struct ext2_block_entry *)fs->relocator_pool; |
From: Coywolf Qi H. <co...@us...> - 2005-12-19 08:06:21
|
Update of /cvsroot/ext2resize/ext2resize In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10636 Modified Files: COPYING Log Message: update FSF address in COPYING Index: COPYING =================================================================== RCS file: /cvsroot/ext2resize/ext2resize/COPYING,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** COPYING 22 Mar 2000 20:16:21 -0000 1.1.1.1 --- COPYING 19 Dec 2005 08:06:13 -0000 1.2 *************** *** 3,7 **** Copyright (C) 1989, 1991 Free Software Foundation, Inc. ! 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. --- 3,7 ---- Copyright (C) 1989, 1991 Free Software Foundation, Inc. ! 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. *************** *** 292,296 **** <one line to give the program's name and a brief idea of what it does.> ! Copyright (C) 19yy <name of author> This program is free software; you can redistribute it and/or modify --- 292,296 ---- <one line to give the program's name and a brief idea of what it does.> ! Copyright (C) <year> <name of author> This program is free software; you can redistribute it and/or modify *************** *** 306,310 **** You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software ! Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --- 306,310 ---- You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software ! Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA *************** *** 314,318 **** when it starts in an interactive mode: ! Gnomovision version 69, Copyright (C) 19yy name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it --- 314,318 ---- when it starts in an interactive mode: ! Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it |
From: Coywolf Qi H. <co...@us...> - 2005-12-19 03:26:56
|
Update of /cvsroot/ext2resize/ext2resize/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30817/src Removed Files: Makefile Log Message: No need to keep generated files. Let './configure' do that for us --- Makefile DELETED --- |
From: Coywolf Qi H. <co...@us...> - 2005-12-19 03:26:54
|
Update of /cvsroot/ext2resize/ext2resize/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30817/doc Removed Files: Makefile Log Message: No need to keep generated files. Let './configure' do that for us --- Makefile DELETED --- |
From: Coywolf Qi H. <co...@us...> - 2005-12-19 03:09:52
|
Update of /cvsroot/ext2resize/ext2resize In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26547 Removed Files: Makefile Log Message: No need to keep this generated file. --- Makefile DELETED --- |
From: Coywolf Qi H. <co...@us...> - 2005-12-18 12:53:32
|
Update of /cvsroot/ext2resize/ext2resize/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5888 Modified Files: ext2prepare.c Log Message: get over 2TB fix, 2TB: 12+29=41 Index: ext2prepare.c =================================================================== RCS file: /cvsroot/ext2resize/ext2resize/src/ext2prepare.c,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** ext2prepare.c 30 Sep 2004 14:04:05 -0000 1.18 --- ext2prepare.c 18 Dec 2005 12:53:19 -0000 1.19 *************** *** 282,286 **** "\tToo much space would be wasted.\n", progname); return 1; ! } else if ((fs->blocksize == 4096 && fs->newblocks > 1<<30) || fs->newblocks > 1<<31) { fprintf(stderr, --- 282,286 ---- "\tToo much space would be wasted.\n", progname); return 1; ! } else if ((fs->blocksize == 4096 && fs->newblocks > 1<<29) || fs->newblocks > 1<<31) { fprintf(stderr, |
From: Coywolf Qi H. <co...@us...> - 2005-12-18 10:39:56
|
Update of /cvsroot/ext2resize/ext2resize/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30973 Modified Files: ext2_unix_io.c Log Message: BLKGETSIZE64 definition `correction'. Thanks to Torvalds' explanation: <http://lkml.org/lkml/2005/12/15/231> Index: ext2_unix_io.c =================================================================== RCS file: /cvsroot/ext2resize/ext2resize/src/ext2_unix_io.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** ext2_unix_io.c 21 Jan 2005 20:10:32 -0000 1.16 --- ext2_unix_io.c 18 Dec 2005 10:39:45 -0000 1.17 *************** *** 48,52 **** #ifndef BLKGETSIZE64 ! #define BLKGETSIZE64 _IOR(0x12,114,unsigned long long) #endif --- 48,52 ---- #ifndef BLKGETSIZE64 ! #define BLKGETSIZE64 _IOR(0x12,114,size_t) #endif |
From: Coywolf Qi H. <co...@us...> - 2005-12-18 09:05:33
|
Update of /cvsroot/ext2resize/ext2resize/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19741 Modified Files: ext2resize.c Log Message: ext2resize usage fix Index: ext2resize.c =================================================================== RCS file: /cvsroot/ext2resize/ext2resize/src/ext2resize.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** ext2resize.c 18 Apr 2001 22:31:21 -0000 1.15 --- ext2resize.c 18 Dec 2005 09:05:23 -0000 1.16 *************** *** 31,35 **** { fprintf(outfile, ! "usage: %s [-dfquvV] device [new_size[bkmgt]]\n\t" "\t-d, --debug : turn debug info on\n" "\t-f, --force : skip safety checks\n" --- 31,35 ---- { fprintf(outfile, ! "usage: %s [-dfquvV] device [new_size[bkmgt]]\n" "\t-d, --debug : turn debug info on\n" "\t-f, --force : skip safety checks\n" |