ext2resize-cvs Mailing List for GNU ext2resize (Page 2)
Status: Inactive
Brought to you by:
adilger
Menu
▾
▴
ext2resize-cvs — CVS commits
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: Petter R. <pe...@us...> - 2006-06-10 07:04:37
|
Update of /cvsroot/ext2resize/ext2resize In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv12517 Modified Files: ext2resize.spec Log Message: Adjust version number to match the next release. Index: ext2resize.spec =================================================================== RCS file: /cvsroot/ext2resize/ext2resize/ext2resize.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ext2resize.spec 30 Sep 2004 20:49:47 -0000 1.8 --- ext2resize.spec 10 Jun 2006 07:04:33 -0000 1.9 *************** *** 14,18 **** Provides: ext2resize ext2online Autoreqprov: on ! %define ver 1.1.19 Version: %{ver} Summary: Second extended filesystem offline and online resize tools --- 14,18 ---- Provides: ext2resize ext2online Autoreqprov: on ! %define ver 1.1.20 Version: %{ver} Summary: Second extended filesystem offline and online resize tools |
|
From: Petter R. <pe...@us...> - 2006-06-10 06:45:26
|
Update of /cvsroot/ext2resize/ext2resize/src In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv1615/src Modified Files: ext2.c ext2.h ext2_resize.c ext2online.c ext2prepare.c Log Message: Get ext2prepare to use the same resize_inode format as mke2fs. Patch by Takashi Sato found in <URL:http://www.ussg.iu.edu/hypermail/linux/kernel/0604.1/1090.html> and manually applied. Index: ext2_resize.c =================================================================== RCS file: /cvsroot/ext2resize/ext2resize/src/ext2_resize.c,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** ext2_resize.c 20 Feb 2006 11:46:44 -0000 1.18 --- ext2_resize.c 10 Jun 2006 06:45:22 -0000 1.19 *************** *** 79,84 **** start+fs->gdblocks+1, EXT2_ACTION_DELETE); ! ext2_set_block_state(fs, start +fs->gdblocks +1, ! 1, 1); } } --- 79,85 ---- start+fs->gdblocks+1, EXT2_ACTION_DELETE); ! if(group!=0 || !ext2_get_block_state(fs, start + fs->gdblocks + 1)) ! ext2_set_block_state(fs, start + fs->gdblocks + 1, ! 1, 1); } } *************** *** 488,491 **** --- 489,495 ---- status = ext2_grow_fs(fs); + if (status) + ext2_fix_resize_inode(fs); + free(fs->relocator_pool); fs->relocator_pool = NULL; Index: ext2online.c =================================================================== RCS file: /cvsroot/ext2resize/ext2resize/src/ext2online.c,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** ext2online.c 30 Sep 2004 14:12:01 -0000 1.24 --- ext2online.c 10 Jun 2006 06:45:22 -0000 1.25 *************** *** 552,573 **** static void ext2_online_finish(struct ext2_fs *fs) { ! int group; ! blk_t block; ! blk_t gdb; ! ! /* Remove blocks as required from Bond inode */ ! for (group = 0, gdb = fs->sb.s_first_data_block + 1; ! group < fs->numgroups; ! group++, gdb += fs->sb.s_blocks_per_group) ! if (ext2_bg_has_super(fs, group)) ! for (block = fs->gdblocks; ! block < fs->newgdblocks; ! block++) { ! if (fs->flags & FL_DEBUG) ! printf("Checking for group block %d " ! "in Bond\n", gdb); ! ext2_block_iterate(fs, &fs->resize, gdb + block, ! EXT2_ACTION_DELETE); ! } /* Save the new number of reserved GDT blocks in the resize inode */ --- 552,556 ---- static void ext2_online_finish(struct ext2_fs *fs) { ! ext2_fix_resize_inode(fs); /* Save the new number of reserved GDT blocks in the resize inode */ Index: ext2.c =================================================================== RCS file: /cvsroot/ext2resize/ext2resize/src/ext2.c,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** ext2.c 9 Jun 2006 21:25:47 -0000 1.32 --- ext2.c 10 Jun 2006 06:45:22 -0000 1.33 *************** *** 291,294 **** --- 291,295 ---- } + /* Remind: prototype returns int, but it may return blk_t */ int ext2_block_iterate(struct ext2_fs *fs, struct ext2_inode *inode, blk_t block, int action) *************** *** 300,303 **** --- 301,307 ---- int i; int i512perblock = 1 << (fs->logsize - 9); + unsigned long long apb; + + apb = fs->u32perblock; if (block == 0 || inode->i_mode == 0) *************** *** 318,417 **** } ! /* Direct blocks for first 12 blocks */ ! for (i = 0, curblock = 0; i < EXT2_NDIR_BLOCKS; i++, curblock++) { ! if (action == EXT2_ACTION_ADD && !inode->i_block[i]) { ! size_t new_size = (curblock + 1) * fs->blocksize; ! ! if (fs->flags & FL_DEBUG) ! printf("add %d as direct block\n", curblock); ! inode->i_block[i] = block; ! /* i_blocks is in 512 byte blocks */ ! inode->i_blocks += i512perblock; ! if (new_size > inode->i_size) ! inode->i_size = new_size; ! ! inode->i_mtime = time(NULL); ! ext2_set_block_state(fs, block, 1, ! !(fs->flags & FL_ONLINE)); ! return curblock; ! } ! if (inode->i_block[i] == block) { ! if (action == EXT2_ACTION_DELETE) { ! if (fs->flags & FL_DEBUG) ! printf("del %d as direct block\n", ! curblock); ! inode->i_block[i] = 0; ! inode->i_blocks -= i512perblock; ! inode->i_mtime = time(NULL); ! if (!(fs->flags & FL_ONLINE)) ! ext2_set_block_state(fs, block, 0, 1); ! } ! return i; ! } ! if (inode->i_block[i]) ! count += i512perblock; ! } ! ! count += inode->i_block[EXT2_IND_BLOCK] ? i512perblock : 0; ! count += inode->i_block[EXT2_DIND_BLOCK] ? i512perblock : 0; ! count += inode->i_block[EXT2_TIND_BLOCK] ? i512perblock : 0; ! ! if (!inode->i_block[EXT2_IND_BLOCK] || ! (count >= inode->i_blocks && action != EXT2_ACTION_ADD)) return -1; ! bh = ext2_bread(fs, inode->i_block[EXT2_IND_BLOCK]); ! udata = (__u32 *)bh->data; ! ! /* Indirect blocks for next 256/512/1024 blocks (for 1k/2k/4k blocks) */ ! for (i = 0; i < fs->u32perblock; i++, curblock++) { ! if (action == EXT2_ACTION_ADD && !udata[i]) { ! size_t new_size = (curblock + 1) * fs->blocksize; ! if (fs->flags & FL_DEBUG) ! printf("add %d to ind block %d\n", curblock, ! inode->i_block[EXT2_IND_BLOCK]); ! bh->dirty = 1; ! udata[i] = block; ! inode->i_blocks += i512perblock; ! if (new_size > inode->i_size) ! inode->i_size = new_size; ! inode->i_mtime = time(NULL); ! ext2_set_block_state(fs, block, 1, ! !(fs->flags & FL_ONLINE)); ! ext2_brelse(bh, 0); ! return curblock; ! } ! if (udata[i] == block) { ! if (action == EXT2_ACTION_DELETE) { ! if (fs->flags & FL_DEBUG) ! printf("del %d from ind block %d\n", ! curblock, ! inode->i_block[EXT2_IND_BLOCK]); ! bh->dirty = 1; ! udata[i] = 0; ! inode->i_blocks -= i512perblock; ! inode->i_mtime = time(NULL); ! if (!(fs->flags & FL_ONLINE)) ! ext2_set_block_state(fs, block, 0, 1); ! } ! ext2_brelse(bh, 0); ! return curblock; ! } ! if (udata[i]) { ! count += i512perblock; ! if (count >= inode->i_blocks && ! action != EXT2_ACTION_ADD) ! return -1; } ! } ! ext2_brelse(bh, 0); - if (!inode->i_block[EXT2_DIND_BLOCK] || - (count >= inode->i_blocks && action != EXT2_ACTION_ADD)) - return -1; - bh = ext2_bread(fs, inode->i_block[EXT2_DIND_BLOCK]); udata = (__u32 *)bh->data; /* Double indirect blocks for next 2^16/2^18/2^20 1k/2k/4k blocks */ --- 322,356 ---- } ! if(!inode->i_block[EXT2_DIND_BLOCK] && action != EXT2_ACTION_ADD) return -1; ! if (!inode->i_block[EXT2_DIND_BLOCK]) { ! unsigned long long inode_size; ! blk_t dindblk; ! dindblk = ext2_find_free_block(fs); ! if(!dindblk) ! return -1; ! ext2_set_block_state(fs, dindblk, 1, 1); ! inode_size = apb*apb + apb + EXT2_NDIR_BLOCKS; ! inode_size *= fs->blocksize; ! inode->i_size = inode_size & 0xFFFFFFFF; ! inode->i_size_high = (inode_size >> 32) & 0xFFFFFFFF; ! if(inode->i_size_high) { ! fs->sb.s_feature_ro_compat |= ! EXT2_FEATURE_RO_COMPAT_LARGE_FILE; } ! inode->i_mtime = time(NULL); ! inode->i_block[EXT2_DIND_BLOCK] = dindblk; ! bh = ext2_bread(fs, inode->i_block[EXT2_DIND_BLOCK]); ! memset(bh->data, 0, fs->blocksize); ! inode->i_blocks += i512perblock; ! } ! else ! bh = ext2_bread(fs, inode->i_block[EXT2_DIND_BLOCK]); udata = (__u32 *)bh->data; + curblock = apb*apb + apb + EXT2_NDIR_BLOCKS; /* Double indirect blocks for next 2^16/2^18/2^20 1k/2k/4k blocks */ *************** *** 420,429 **** __u32 *udata2; int j; ! if (!udata[i]) { ext2_brelse(bh, 0); ! ext2_brelse(bh2, 0); ! return -1; } bh2 = ext2_bread(fs, udata[i]); udata2 = (__u32 *)bh2->data; --- 359,385 ---- __u32 *udata2; int j; + int grp, gdb_offset; ! gdb_offset = fs->sb.s_first_data_block + 1; ! grp = block/fs->sb.s_blocks_per_group; ! if(grp == 0 && action == EXT2_ACTION_ADD) { ! udata[(block - gdb_offset)%fs->u32perblock] = block; ! ext2_zero_blocks(fs, block, 1); ! ext2_set_block_state(fs, block, 1, 1); ! bh->dirty = 1; ! inode->i_blocks += i512perblock; ! inode->i_mtime = time(NULL); ext2_brelse(bh, 0); ! return 1; } + if (!udata[i]) + continue; + if(udata[i] == block){ + ext2_brelse(bh, 0); + return 1; + } + if(((block - gdb_offset)%fs->u32perblock) != i) + continue; + bh2 = ext2_bread(fs, udata[i]); udata2 = (__u32 *)bh2->data; *************** *** 1084,1085 **** --- 1040,1089 ---- return NULL; } + + /* Update resize_inode's blocks */ + void ext2_fix_resize_inode(struct ext2_fs *fs) { + if (fs->sb.s_feature_compat & EXT2_FEATURE_COMPAT_RESIZE_INODE) { + int i; + blk_t block; + struct ext2_inode *inode; + + ext2_read_inode(fs, EXT2_RESIZE_INO, &fs->resize); + inode = &fs->resize; + inode->i_mtime = 0; + + if (inode->i_block[EXT2_DIND_BLOCK]) { + ext2_zero_blocks(fs, inode->i_block[EXT2_DIND_BLOCK], 1); + inode->i_blocks = 1 << (fs->logsize - 9); + } + + for (i = 0, block = fs->sb.s_first_data_block + fs->newgdblocks + 1; + i < fs->newgroups; i++, block += fs->sb.s_blocks_per_group) { + int j; + + if (!ext2_bg_has_super(fs, i)) + continue; + for (j = 0; j < fs->resgdblocks; j++) { + if(i == 0) + ext2_zero_blocks(fs, block + j, 1); + + if (j < fs->blocksize / 4){ + if (ext2_get_block_state(fs, block + j)) + ext2_set_block_state(fs, block + j, 0, 1); + ext2_block_iterate(fs, inode, block + j, EXT2_ACTION_ADD); + } + else{ + if (ext2_get_block_state(fs, block + j)) + ext2_set_block_state(fs, block + j, 0, 1); + } + } + } + + fs->sb.s_reserved_gdt_blocks = fs->resgdblocks; + if (fs->resgdblocks > fs->blocksize / 4) + fs->sb.s_reserved_gdt_blocks = fs->blocksize / 4; + fs->metadirty |= EXT2_META_SB; + + if (inode->i_mtime) + ext2_write_inode(fs, EXT2_RESIZE_INO, inode); + } + } Index: ext2prepare.c =================================================================== RCS file: /cvsroot/ext2resize/ext2resize/src/ext2prepare.c,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** ext2prepare.c 18 Dec 2005 12:53:19 -0000 1.19 --- ext2prepare.c 10 Jun 2006 06:45:22 -0000 1.20 *************** *** 156,159 **** --- 156,160 ---- diff = fs->newgdblocks - fs->gdblocks; + fs->resgdblocks = fs->sb.s_reserved_gdt_blocks = diff; /* we store the number of reserved blocks in the inode version field */ inode->i_generation = diff; Index: ext2.h =================================================================== RCS file: /cvsroot/ext2resize/ext2resize/src/ext2.h,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** ext2.h 9 Jun 2006 21:25:47 -0000 1.25 --- ext2.h 10 Jun 2006 06:45:22 -0000 1.26 *************** *** 244,247 **** --- 244,249 ---- char *prog); + void ext2_fix_resize_inode(struct ext2_fs *fs); + #define set_bit(buf, offset) buf[(offset)>>3] |= _bitmap[(offset)&7] #define clear_bit(buf, offset) buf[(offset)>>3] &= ~_bitmap[(offset)&7] |
|
From: Petter R. <pe...@us...> - 2006-06-10 06:45:25
|
Update of /cvsroot/ext2resize/ext2resize In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv1615 Modified Files: NEWS Log Message: Get ext2prepare to use the same resize_inode format as mke2fs. Patch by Takashi Sato found in <URL:http://www.ussg.iu.edu/hypermail/linux/kernel/0604.1/1090.html> and manually applied. Index: NEWS =================================================================== RCS file: /cvsroot/ext2resize/ext2resize/NEWS,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** NEWS 9 Jun 2006 22:16:46 -0000 1.7 --- NEWS 10 Jun 2006 06:45:21 -0000 1.8 *************** *** 5,8 **** --- 5,9 ---- * Adjust handling of ioctl BLKGETSIZE64 to match recent kernels. * Teach ext2prepare how to handle file systems over 2 TiB. + * Update ext2prepare to use the same resize_inode format as mke2fs. * Renamed some functions to make the code easier to read. * Fix bug in ext2 metainfo handling (use correct offset). |
|
From: Petter R. <pe...@us...> - 2006-06-09 22:17:49
|
Update of /cvsroot/ext2resize/ext2resize In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv2787 Modified Files: NEWS Log Message: More info fetched from the CVS log. Index: NEWS =================================================================== RCS file: /cvsroot/ext2resize/ext2resize/NEWS,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** NEWS 9 Jun 2006 21:58:39 -0000 1.6 --- NEWS 9 Jun 2006 22:16:46 -0000 1.7 *************** *** 1,4 **** --- 1,11 ---- Version 1.1.20 (2006-XX-XX) * Fixed a few compiler warnings. + * Fix typos in the documentation and manual. + * Correct handling of endian issues. + * Adjust handling of ioctl BLKGETSIZE64 to match recent kernels. + * Teach ext2prepare how to handle file systems over 2 TiB. + * Renamed some functions to make the code easier to read. + * Fix bug in ext2 metainfo handling (use correct offset). + * Corrected and improved program output. Version 1.1.19 (2004-09-30) |
|
From: Petter R. <pe...@us...> - 2006-06-09 22:03:36
|
Update of /cvsroot/ext2resize/ext2resize/src In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv29770/src Modified Files: Makefile.am Log Message: Make sure to include new files tune.h, bitops.h and ext2_fs.h in the source tarball. Index: Makefile.am =================================================================== RCS file: /cvsroot/ext2resize/ext2resize/src/Makefile.am,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Makefile.am 9 Jun 2006 21:25:13 -0000 1.9 --- Makefile.am 9 Jun 2006 22:03:33 -0000 1.10 *************** *** 8,12 **** libext2resize_a_SOURCES = ext2.c ext2_block_relocator.c ext2_buffer.c llseek.c \ ! ext2_inode_relocator.c ext2_meta.c ext2_resize.c ext2_unix_io.c tune.c #libext2resize_a_SOURCES += ext2_journal.c ext2_mkfs.c --- 8,13 ---- libext2resize_a_SOURCES = ext2.c ext2_block_relocator.c ext2_buffer.c llseek.c \ ! ext2_inode_relocator.c ext2_meta.c ext2_resize.c ext2_unix_io.c \ ! tune.c tune.h bitops.h ext2_fs.h #libext2resize_a_SOURCES += ext2_journal.c ext2_mkfs.c |
|
From: Petter R. <pe...@us...> - 2006-06-09 21:58:42
|
Update of /cvsroot/ext2resize/ext2resize In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv27479 Modified Files: NEWS README Log Message: Start using the NEWS file to list a summary of the changes. Move the old comments in that file to the README. Index: README =================================================================== RCS file: /cvsroot/ext2resize/ext2resize/README,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** README 25 Jun 2002 09:54:08 -0000 1.8 --- README 9 Jun 2006 21:58:39 -0000 1.9 *************** *** 24,25 **** --- 24,36 ---- Andreas Dilger <ad...@cl...> + + Some notes: + + Report from Magnus Sandin using ext2resize to grow an ext2 filesystem + on linear-appended MD disks, from 50GB to 110GB, over 3 disks. + + Report from Michael Velotta of using ext2resize to grow an LVM Logical + Volume and its ext2 filesystem first from 150GB to 240GB, then all the way + to 463GB! The full LV was spread across 8 IDE disks. It took 40 minutes + for the first resize (probably because of block relocation for group + descriptors), no report of how long the second took. Index: NEWS =================================================================== RCS file: /cvsroot/ext2resize/ext2resize/NEWS,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** NEWS 25 Jun 2002 09:54:08 -0000 1.5 --- NEWS 9 Jun 2006 21:58:39 -0000 1.6 *************** *** 1,8 **** ! Report from Magnus Sandin using ext2resize to grow an ext2 filesystem ! on linear-appended MD disks, from 50GB to 110GB, over 3 disks. ! Report from Michael Velotta of using ext2resize to grow an LVM Logical ! Volume and its ext2 filesystem first from 150GB to 240GB, then all the way ! to 463GB! The full LV was spread across 8 IDE disks. It took 40 minutes ! for the first resize (probably because of block relocation for group ! descriptors), no report of how long the second took. --- 1,8 ---- ! Version 1.1.20 (2006-XX-XX) ! * Fixed a few compiler warnings. ! Version 1.1.19 (2004-09-30) ! [news summary were not recored at the time] ! ! Version 1.1.18 (2002-05-10) ! [news summary were not recored at the time] |
|
From: Petter R. <pe...@us...> - 2006-06-09 21:25:53
|
Update of /cvsroot/ext2resize/ext2resize/src In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv13657/src Modified Files: ext2.c ext2.h Log Message: Avoid some compiler warnings. Index: ext2.h =================================================================== RCS file: /cvsroot/ext2resize/ext2resize/src/ext2.h,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** ext2.h 9 May 2005 05:46:53 -0000 1.24 --- ext2.h 9 Jun 2006 21:25:47 -0000 1.25 *************** *** 249,253 **** #ifdef USE_EXT2_IS_DATA_BLOCK ! static int __inline__ ext2_is_data_block(struct ext2_fs *fs, blk_t block) { blk_t blk; --- 249,253 ---- #ifdef USE_EXT2_IS_DATA_BLOCK ! static __inline__ int ext2_is_data_block(struct ext2_fs *fs, blk_t block) { blk_t blk; Index: ext2.c =================================================================== RCS file: /cvsroot/ext2resize/ext2resize/src/ext2.c,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** ext2.c 5 Jun 2006 05:36:04 -0000 1.31 --- ext2.c 9 Jun 2006 21:25:47 -0000 1.32 *************** *** 417,421 **** /* Double indirect blocks for next 2^16/2^18/2^20 1k/2k/4k blocks */ for (i = 0; i < fs->u32perblock; i++) { ! struct ext2_buffer_head *bh2; __u32 *udata2; int j; --- 417,421 ---- /* Double indirect blocks for next 2^16/2^18/2^20 1k/2k/4k blocks */ for (i = 0; i < fs->u32perblock; i++) { ! struct ext2_buffer_head *bh2 = NULL; __u32 *udata2; int j; |
|
From: Petter R. <pe...@us...> - 2006-06-09 21:25:21
|
Update of /cvsroot/ext2resize/ext2resize/src In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv13606/src Modified Files: Makefile.am Log Message: Increase default compiler warning level. Index: Makefile.am =================================================================== RCS file: /cvsroot/ext2resize/ext2resize/src/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Makefile.am 17 Feb 2006 11:12:25 -0000 1.8 --- Makefile.am 9 Jun 2006 21:25:13 -0000 1.9 *************** *** 28,30 **** LIBS = @LIBS@ ! AM_CFLAGS = -Wall -g --- 28,30 ---- LIBS = @LIBS@ ! AM_CFLAGS = -W -Wall -g |
|
From: Petter R. <pe...@us...> - 2006-06-09 21:18:38
|
Update of /cvsroot/ext2resize/ext2resize/doc In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv10721/doc Modified Files: ext2online.8 Log Message: Fix typo in the example, make sure mke2fs is called the correct way. Index: ext2online.8 =================================================================== RCS file: /cvsroot/ext2resize/ext2resize/doc/ext2online.8,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ext2online.8 9 May 2005 06:00:44 -0000 1.11 --- ext2online.8 9 Jun 2006 21:18:33 -0000 1.12 *************** *** 128,132 **** \ dd if=/dev/zero of=/tmp/file bs=1k count=64k .br ! \ mke2fs \-F /tmp/file 32768 .br \ mkdir /mnt/test --- 128,132 ---- \ dd if=/dev/zero of=/tmp/file bs=1k count=64k .br ! \ mke2fs \-F \-f 32768 /tmp/file .br \ mkdir /mnt/test |
|
From: Andreas D. <ad...@us...> - 2006-06-06 02:19:57
|
Update of /cvsroot/ext2resize/ext2resize/src In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv23746/src Modified Files: ext2.c Log Message: Fix ext2_move_blocks() to not move overlapping block ranges. Handle large inodes. Don't always print message about itable offsets. Index: ext2.c =================================================================== RCS file: /cvsroot/ext2resize/ext2resize/src/ext2.c,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** ext2.c 9 May 2005 05:46:52 -0000 1.30 --- ext2.c 5 Jun 2006 05:36:04 -0000 1.31 *************** *** 129,138 **** free(buf); ! } else if (src > dest) for (i = 0; i < num; i++) ext2_copy_block(fs, src + i, dest + i); ! else ! for (i = num - 1; i >= 0; i--) ! ext2_copy_block(fs, src + i, dest + i); } --- 129,139 ---- free(buf); ! } else if (src > dest) { for (i = 0; i < num; i++) ext2_copy_block(fs, src + i, dest + i); ! } else { ! for (i = num; i > 0; i--) ! ext2_copy_block(fs, src + i - 1, dest + i - 1); ! } } *************** *** 220,224 **** group = inode / fs->sb.s_inodes_per_group; ! offset = (inode % fs->sb.s_inodes_per_group) * sizeof(struct ext2_inode); *block = fs->gd[group].bg_inode_table + (offset >> fs->logsize); --- 221,227 ---- group = inode / fs->sb.s_inodes_per_group; ! offset = (inode % fs->sb.s_inodes_per_group) * ! (fs->sb.s_rev_level == EXT2_GOOD_OLD_REV ? ! EXT2_GOOD_OLD_INODE_SIZE : fs->sb.s_inode_size); *block = fs->gd[group].bg_inode_table + (offset >> fs->logsize); *************** *** 294,298 **** __u32 *udata; blk_t curblock; ! int count = 0; int i; int i512perblock = 1 << (fs->logsize - 9); --- 297,301 ---- __u32 *udata; blk_t curblock; ! __u32 count = 0; int i; int i512perblock = 1 << (fs->logsize - 9); *************** *** 741,758 **** "group %d inode bitmap has offset %d, not %d\n", group, fs->gd[group].bg_inode_bitmap, ib); ! if (fs->gd[group].bg_inode_table != it) { fprintf(stderr, "group %d inode table has offset %d, not %d\n", group, fs->gd[group].bg_inode_table-start, it-start); - /* - fprintf(stderr, - "This ext2 filesystem has a strange layout!\n" - "Please use dumpe2fs and send output to: " - "<ext...@li...>.\n" - "I won't resize it, sorry.\n"); - return 0; - */ - } } --- 744,752 ---- "group %d inode bitmap has offset %d, not %d\n", group, fs->gd[group].bg_inode_bitmap, ib); ! if (fs->gd[group].bg_inode_table != it && fs->flags & FL_DEBUG) fprintf(stderr, "group %d inode table has offset %d, not %d\n", group, fs->gd[group].bg_inode_table-start, it-start); } |
|
From: Andreas D. <ad...@us...> - 2006-06-06 02:19:55
|
Update of /cvsroot/ext2resize/ext2resize In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv23746 Modified Files: THANKS Log Message: Fix ext2_move_blocks() to not move overlapping block ranges. Handle large inodes. Don't always print message about itable offsets. Index: THANKS =================================================================== RCS file: /cvsroot/ext2resize/ext2resize/THANKS,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** THANKS 25 Jun 2002 09:54:08 -0000 1.8 --- THANKS 5 Jun 2006 05:36:04 -0000 1.9 *************** *** 29,33 **** Eric Gustavsson <cy...@al...> Michael Harris <mic...@wc...> ! Joey Hess <jo...@ma...> Martin Hinner <mh...@li...> Rolf Jakob <rj...@du...> --- 29,33 ---- Eric Gustavsson <cy...@al...> Michael Harris <mic...@wc...> ! Joey Hess <jo...@de...> Martin Hinner <mh...@li...> Rolf Jakob <rj...@du...> |
|
From: Coywolf Qi H. <co...@us...> - 2006-02-20 13:48:25
|
Update of /cvsroot/ext2resize/ext2resize In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18832 Added Files: .cvsignore Log Message: ignore some autogenerated files --- NEW FILE: .cvsignore --- Makefile.in aclocal.m4 autom4te.cache configure |
|
From: Coywolf Qi H. <co...@us...> - 2006-02-20 13:48:25
|
Update of /cvsroot/ext2resize/ext2resize/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18832/src Added Files: .cvsignore Log Message: ignore some autogenerated files --- NEW FILE: .cvsignore --- Makefile.in config.h.in |
|
From: Coywolf Qi H. <co...@us...> - 2006-02-20 13:48:25
|
Update of /cvsroot/ext2resize/ext2resize/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18832/doc Added Files: .cvsignore Log Message: ignore some autogenerated files --- NEW FILE: .cvsignore --- Makefile.in |
|
From: Coywolf Qi H. <co...@us...> - 2006-02-20 13:33:33
|
Update of /cvsroot/ext2resize/ext2resize/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13594/doc Removed Files: Makefile.in Log Message: Do not keep generated files in CVS --- Makefile.in DELETED --- |
|
From: Coywolf Qi H. <co...@us...> - 2006-02-20 13:33:33
|
Update of /cvsroot/ext2resize/ext2resize/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13594/src Removed Files: Makefile.in config.h.in Log Message: Do not keep generated files in CVS --- Makefile.in DELETED --- --- config.h.in DELETED --- |
|
From: Coywolf Qi H. <co...@us...> - 2006-02-20 13:19:50
|
Update of /cvsroot/ext2resize/ext2resize In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7154 Removed Files: Makefile.in configure Log Message: keep no generated files in CVS --- Makefile.in DELETED --- --- configure DELETED --- |
|
From: Coywolf Qi H. <co...@us...> - 2006-02-20 13:15:16
|
Update of /cvsroot/ext2resize/ext2resize In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4905 Removed Files: aclocal.m4 Log Message: keep no generated files in CVS --- aclocal.m4 DELETED --- |
|
From: Coywolf Qi H. <co...@us...> - 2006-02-20 11:46:54
|
Update of /cvsroot/ext2resize/ext2resize/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26450/src Modified Files: ext2_resize.c Log Message: a grammar fix Index: ext2_resize.c =================================================================== RCS file: /cvsroot/ext2resize/ext2resize/src/ext2_resize.c,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** ext2_resize.c 9 May 2005 05:46:53 -0000 1.17 --- ext2_resize.c 20 Feb 2006 11:46:44 -0000 1.18 *************** *** 462,475 **** if (fs->newblocks == fs->sb.s_blocks_count) { ! fprintf(stderr, "%s: new size is same as current (%u)\n", fs->prog, fs->newblocks); return 1; } else { ! if(fs->flags & FL_SWAB_BYTES) { printf("Can't resize on big endian yet!\n"); return 0; } ! } ! if ((fs->relocator_pool = --- 462,476 ---- if (fs->newblocks == fs->sb.s_blocks_count) { ! fprintf(stderr, ! "%s: new size is the same as the current (%u)\n", fs->prog, fs->newblocks); return 1; } else { ! if (fs->flags & FL_SWAB_BYTES) { printf("Can't resize on big endian yet!\n"); return 0; } ! } ! if ((fs->relocator_pool = *************** *** 480,484 **** } fs->relocator_pool_end = fs->relocator_pool + ! (ext2_relocator_pool_size << 10); if (fs->newblocks < fs->sb.s_blocks_count) --- 481,485 ---- } fs->relocator_pool_end = fs->relocator_pool + ! (ext2_relocator_pool_size << 10); if (fs->newblocks < fs->sb.s_blocks_count) |
|
From: Coywolf Qi H. <co...@us...> - 2006-02-20 09:51:53
|
Update of /cvsroot/ext2resize/ext2resize In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10421 Added Files: configure.ac Removed Files: configure.in Log Message: * configure.in: Rename as... * configure.ac: this. Bump to 1.1.20 --- NEW FILE: configure.ac --- dnl Process this file with autoconf to produce a configure script AC_INIT(src/ext2.h) AM_INIT_AUTOMAKE(ext2resize, 1.1.20) AM_CONFIG_HEADER(src/config.h) dnl Checks for programs. AC_PROG_CC AC_PROG_GCC_TRADITIONAL AC_PROG_RANLIB dnl Checks for libraries. dnl Checks for header files. AC_CHECK_HEADERS(getopt.h) AC_CHECK_HEADERS(signal.h) AC_CHECK_HEADERS(sys/types.h) AC_CHECK_HEADERS(unistd.h) AC_CHECK_HEADERS(linux/unistd.h) dnl Checks for typedefs, structures and compiler characteristics. AC_CHECK_TYPE(__s8, int8_t) AC_CHECK_TYPE(__u8, u_int8_t) AC_CHECK_TYPE(__s16, int16_t) AC_CHECK_TYPE(__u16, u_int16_t) AC_CHECK_TYPE(__s32, int32_t) AC_CHECK_TYPE(__u32, u_int32_t) AC_CHECK_TYPE(loff_t, unsigned) dnl Checks for library functions. AC_CHECK_FUNCS(open64) AC_CHECK_FUNCS(lseek64) AC_CHECK_FUNCS(llseek) dnl check if big endian AC_C_BIGENDIAN AC_OUTPUT(Makefile doc/Makefile src/Makefile) --- configure.in DELETED --- |
|
From: Coywolf Qi H. <co...@us...> - 2006-02-20 09:36:40
|
Update of /cvsroot/ext2resize/ext2resize In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5384 Removed Files: acconfig.h Log Message: Removed useless file --- acconfig.h DELETED --- |
|
From: Coywolf Qi H. <co...@us...> - 2006-02-18 06:04:40
|
Update of /cvsroot/ext2resize/ext2resize/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13416 Modified Files: ext2_block_relocator.c Log Message: Do some s/foobar/foo_bar renamings, some s/%d/%u/ fix and tidy. 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 18 Feb 2006 06:04:32 -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; *************** *** 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; *************** *** 113,117 **** blk_t tval; ! max_e = state->usedentries - 1; min_e = 0; retv = NULL; --- 114,118 ---- 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++; --- 158,162 ---- ent->isindirectblock = indirect; ! state->resolved_entries++; state->start[indirect].num++; *************** *** 325,329 **** } ! if (state->resolvedentries == state->usedentries) break; } --- 326,330 ---- } ! 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; } --- 334,343 ---- 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); } --- 351,355 ---- 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) { --- 369,373 ---- 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); } --- 392,397 ---- 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; --- 409,413 ---- 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; --- 496,500 ---- 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; --- 516,520 ---- 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; --- 536,540 ---- 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); --- 542,546 ---- 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); --- 553,557 ---- 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; --- 587,592 ---- } ! 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; --- 612,620 ---- } ! 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; } --- 622,626 ---- 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; --- 644,653 ---- 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 %u+%u, newgdblocks %u, " ! "olditoffset %d, newitoffset %d, new_alloc_offset %u)\n", fs->gdblocks, fs->resgdblocks, fs->newgdblocks, ! fs->itoffset, newitoffset, state->new_alloc_offset); for (group = 0, start = fs->sb.s_first_data_block; *************** *** 786,789 **** --- 787,791 ---- if (inode->i_mtime) ext2_write_inode(fs, EXT2_RESIZE_INO, inode); + return ext2_block_relocator_flush(fs, state); } *************** *** 800,804 **** printf("%s\n", __FUNCTION__); ! state->newallocoffset = fs->itoffset + fs->inodeblocks; ext2_read_inode(fs, EXT2_RESIZE_INO, inode); inode->i_mtime = 0; --- 802,806 ---- 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; --- 915,923 ---- 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...> - 2006-02-17 12:04:16
|
Update of /cvsroot/ext2resize/ext2resize/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32637/src Modified Files: ext2_meta.c Log Message: Bug fix: use correct new IT offset. Index: ext2_meta.c =================================================================== RCS file: /cvsroot/ext2resize/ext2resize/src/ext2_meta.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** ext2_meta.c 30 Sep 2004 14:01:41 -0000 1.13 --- ext2_meta.c 17 Feb 2006 12:04:09 -0000 1.14 *************** *** 110,113 **** --- 110,120 ---- int diff; + has_sb = ext2_bg_has_super(fs, group); + + if (!has_sb) + new_itoffset = 2; + else + new_itoffset = fs->newgdblocks + 3; + diff = start + new_itoffset - fs->gd[group].bg_inode_table; old_itend =fs->gd[group].bg_inode_table +fs->inodeblocks -start; *************** *** 117,122 **** bpg = fs->sb.s_blocks_count - start; - has_sb = ext2_bg_has_super(fs, group); - bb = fs->gd[group].bg_block_bitmap - start; ib = fs->gd[group].bg_inode_bitmap - start; --- 124,127 ---- |
|
From: Coywolf Qi H. <co...@us...> - 2006-02-17 11:31:02
|
Update of /cvsroot/ext2resize/ext2resize/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15787/src Added Files: bitops.h Log Message: Quick hack to Andreas Dilger endianess' fix. --- NEW FILE: bitops.h --- #include <linux/byteorder/swab.h> #define ext2fs_swab16 __swab16 #define ext2fs_swab32 __swab32 #if 0 static inline __u16 ext2fs_swab16(__u16 val) { return (val >> 8) | (val << 8); } static inline __u32 ext2fs_swab32(__u32 val) { return ((val>>24) | ((val>>8)&0xFF00) | ((val<<8)&0xFF0000) | (val<<24)); } #endif |
|
From: Coywolf Qi H. <co...@us...> - 2006-02-17 11:12:43
|
Update of /cvsroot/ext2resize/ext2resize/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8741/src Modified Files: Makefile.am Makefile.in Log Message: Update automake/autoconf bits Index: Makefile.in =================================================================== RCS file: /cvsroot/ext2resize/ext2resize/src/Makefile.in,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Makefile.in 30 Sep 2004 13:58:47 -0000 1.13 --- Makefile.in 17 Feb 2006 11:12:25 -0000 1.14 *************** *** 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,34 ---- @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,115 **** 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@ ! ! sbin_PROGRAMS = ext2resize ext2prepare ext2online ! ! #noinst_PROGRAMS = tst ! noinst_LIBRARIES = libext2resize.a ! ! libext2resize_a_SOURCES = ext2.c ext2_block_relocator.c ext2_buffer.c llseek.c \ ! ext2_inode_relocator.c ext2_meta.c ext2_resize.c ext2_unix_io.c tune.c ! ! ! ! #libext2resize_a_SOURCES += ext2_journal.c ext2_mkfs.c ! ext2resize_SOURCES = ext2resize.c ! ext2resize_LDADD = libext2resize.a ! ! ext2prepare_SOURCES = ext2prepare.c ! ext2prepare_LDADD = libext2resize.a ! ! ext2online_SOURCES = ext2online.c ! ext2online_LDADD = libext2resize.a ! ! ! #tst_SOURCES = tst.c ! #tst_LDADD = libext2resize.a /usr/lib/libuuid.a ! noinst_HEADERS = ext2.h ! ! LIBS = @LIBS@ ! ! CFLAGS = -Wall -g subdir = src mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = LIBRARIES = $(noinst_LIBRARIES) ! ! libext2resize_a_AR = $(AR) cru libext2resize_a_LIBADD = am_libext2resize_a_OBJECTS = ext2.$(OBJEXT) \ --- 37,56 ---- PRE_UNINSTALL = : POST_UNINSTALL = : ! sbin_PROGRAMS = ext2resize$(EXEEXT) ext2prepare$(EXEEXT) \ ! ext2online$(EXEEXT) subdir = src + DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/config.h.in + 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 = config.h CONFIG_CLEAN_FILES = LIBRARIES = $(noinst_LIBRARIES) ! AR = ar ! ARFLAGS = cru ! libext2resize_a_AR = $(AR) $(ARFLAGS) libext2resize_a_LIBADD = am_libext2resize_a_OBJECTS = ext2.$(OBJEXT) \ *************** *** 119,166 **** ext2_unix_io.$(OBJEXT) tune.$(OBJEXT) libext2resize_a_OBJECTS = $(am_libext2resize_a_OBJECTS) ! sbin_PROGRAMS = ext2resize$(EXEEXT) ext2prepare$(EXEEXT) \ ! ext2online$(EXEEXT) PROGRAMS = $(sbin_PROGRAMS) - am_ext2online_OBJECTS = ext2online.$(OBJEXT) ext2online_OBJECTS = $(am_ext2online_OBJECTS) ext2online_DEPENDENCIES = libext2resize.a - ext2online_LDFLAGS = am_ext2prepare_OBJECTS = ext2prepare.$(OBJEXT) ext2prepare_OBJECTS = $(am_ext2prepare_OBJECTS) ext2prepare_DEPENDENCIES = libext2resize.a - ext2prepare_LDFLAGS = am_ext2resize_OBJECTS = ext2resize.$(OBJEXT) ext2resize_OBJECTS = $(am_ext2resize_OBJECTS) ext2resize_DEPENDENCIES = libext2resize.a ! ext2resize_LDFLAGS = ! ! DEFS = @DEFS@ ! DEFAULT_INCLUDES = -I. -I$(srcdir) -I. ! CPPFLAGS = @CPPFLAGS@ ! LDFLAGS = @LDFLAGS@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles - @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ext2.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/ext2_block_relocator.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/ext2_buffer.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/ext2_inode_relocator.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/ext2_meta.Po ./$(DEPDIR)/ext2_resize.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/ext2_unix_io.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/ext2online.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/ext2prepare.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/ext2resize.Po ./$(DEPDIR)/llseek.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/tune.Po COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ DIST_SOURCES = $(libext2resize_a_SOURCES) $(ext2online_SOURCES) \ $(ext2prepare_SOURCES) $(ext2resize_SOURCES) HEADERS = $(noinst_HEADERS) - DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in config.h.in - SOURCES = $(libext2resize_a_SOURCES) $(ext2online_SOURCES) $(ext2prepare_SOURCES) $(ext2resize_SOURCES) all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am --- 60,181 ---- ext2_unix_io.$(OBJEXT) tune.$(OBJEXT) libext2resize_a_OBJECTS = $(am_libext2resize_a_OBJECTS) ! am__installdirs = "$(DESTDIR)$(sbindir)" ! sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(sbin_PROGRAMS) am_ext2online_OBJECTS = ext2online.$(OBJEXT) ext2online_OBJECTS = $(am_ext2online_OBJECTS) ext2online_DEPENDENCIES = libext2resize.a am_ext2prepare_OBJECTS = ext2prepare.$(OBJEXT) ext2prepare_OBJECTS = $(am_ext2prepare_OBJECTS) ext2prepare_DEPENDENCIES = libext2resize.a am_ext2resize_OBJECTS = ext2resize.$(OBJEXT) ext2resize_OBJECTS = $(am_ext2resize_OBJECTS) ext2resize_DEPENDENCIES = libext2resize.a ! DEFAULT_INCLUDES = -I. -I$(srcdir) -I. depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ + SOURCES = $(libext2resize_a_SOURCES) $(ext2online_SOURCES) \ + $(ext2prepare_SOURCES) $(ext2resize_SOURCES) DIST_SOURCES = $(libext2resize_a_SOURCES) $(ext2online_SOURCES) \ $(ext2prepare_SOURCES) $(ext2resize_SOURCES) HEADERS = $(noinst_HEADERS) + ETAGS = etags + CTAGS = ctags + 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@ + #noinst_PROGRAMS = tst + noinst_LIBRARIES = libext2resize.a + libext2resize_a_SOURCES = ext2.c ext2_block_relocator.c ext2_buffer.c llseek.c \ + ext2_inode_relocator.c ext2_meta.c ext2_resize.c ext2_unix_io.c tune.c + #libext2resize_a_SOURCES += ext2_journal.c ext2_mkfs.c + ext2resize_SOURCES = ext2resize.c + ext2resize_LDADD = libext2resize.a + ext2prepare_SOURCES = ext2prepare.c + ext2prepare_LDADD = libext2resize.a + ext2online_SOURCES = ext2online.c + ext2online_LDADD = libext2resize.a + + #tst_SOURCES = tst.c + #tst_LDADD = libext2resize.a /usr/lib/libuuid.a + noinst_HEADERS = ext2.h + AM_CFLAGS = -Wall -g all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am *************** *** 168,176 **** .SUFFIXES: .SUFFIXES: .c .o .obj ! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu src/Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) config.h: stamp-h1 --- 183,215 ---- .SUFFIXES: .SUFFIXES: .c .o .obj ! $(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 src/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu src/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 config.h: stamp-h1 *************** *** 183,196 **** @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status src/config.h ! ! $(srcdir)/config.h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/acconfig.h cd $(top_srcdir) && $(AUTOHEADER) ! touch $(srcdir)/config.h.in distclean-hdr: -rm -f config.h stamp-h1 - AR = ar - clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) --- 222,233 ---- @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status src/config.h ! $(srcdir)/config.h.in: $(am__configure_deps) $(top_srcdir)/acconfig.h cd $(top_srcdir) && $(AUTOHEADER) ! rm -f stamp-h1 ! touch $@ distclean-hdr: -rm -f config.h stamp-h1 clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) *************** *** 199,206 **** $(libext2resize_a_AR) libext2resize.a $(libext2resize_a_OBJECTS) $(libext2resize_a_LIBADD) $(RANLIB) libext2resize.a - sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-sbinPROGRAMS: $(sbin_PROGRAMS) @$(NORMAL_INSTALL) ! $(mkinstalldirs) $(DESTDIR)$(sbindir) @list='$(sbin_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ --- 236,242 ---- $(libext2resize_a_AR) libext2resize.a $(libext2resize_a_OBJECTS) $(libext2resize_a_LIBADD) $(RANLIB) libext2resize.a install-sbinPROGRAMS: $(sbin_PROGRAMS) @$(NORMAL_INSTALL) ! test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)" @list='$(sbin_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ *************** *** 208,213 **** ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ ! echo " $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f"; \ ! $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f; \ else :; fi; \ done --- 244,249 ---- ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ ! echo " $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \ ! $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \ else :; fi; \ done *************** *** 217,222 **** @list='$(sbin_PROGRAMS)'; for p in $$list; do \ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ ! echo " rm -f $(DESTDIR)$(sbindir)/$$f"; \ ! rm -f $(DESTDIR)$(sbindir)/$$f; \ done --- 253,258 ---- @list='$(sbin_PROGRAMS)'; for p in $$list; do \ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ ! echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \ ! rm -f "$(DESTDIR)$(sbindir)/$$f"; \ done *************** *** 234,238 **** mostlyclean-compile: ! -rm -f *.$(OBJEXT) core *.core distclean-compile: --- 270,274 ---- mostlyclean-compile: ! -rm -f *.$(OBJEXT) distclean-compile: *************** *** 252,277 **** @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tune.Po@am__quote@ - distclean-depend: - -rm -rf ./$(DEPDIR) - .c.o: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: ! @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ! @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! $(COMPILE) -c `cygpath -w $<` ! CCDEPMODE = @CCDEPMODE@ uninstall-info-am: - ETAGS = etags - ETAGSFLAGS = - - tags: TAGS - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ --- 288,306 ---- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tune.Po@am__quote@ .c.o: ! @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ ! @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: ! @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ ! @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ! @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ! @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` uninstall-info-am: ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ *************** *** 282,285 **** --- 311,315 ---- END { for (i in files) print i; }'`; \ mkid -fID $$unique + tags: TAGS TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ *************** *** 293,298 **** $(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 --- 323,344 ---- $(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: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) ! tags=; \ ! here=`pwd`; \ ! list='$(SOURCES) $(HEADERS) config.h.in $(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 *************** *** 303,319 **** distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH ! 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=''; \ --- 349,367 ---- distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags 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=''; \ *************** *** 333,340 **** check: check-am all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(HEADERS) config.h - installdirs: ! $(mkinstalldirs) $(DESTDIR)$(sbindir) ! install: install-am install-exec: install-exec-am --- 381,388 ---- check: check-am all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(HEADERS) config.h installdirs: ! for dir in "$(DESTDIR)$(sbindir)"; do \ ! test -z "$$dir" || $(mkdir_p) "$$dir"; \ ! done install: install-am install-exec: install-exec-am *************** *** 348,352 **** install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install --- 396,400 ---- 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 *************** *** 356,360 **** distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: --- 404,408 ---- distclean-generic: ! -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: *************** *** 367,373 **** distclean: distclean-am ! ! distclean-am: clean-am distclean-compile distclean-depend \ ! distclean-generic distclean-hdr distclean-tags dvi: dvi-am --- 415,422 ---- distclean: distclean-am ! -rm -rf ./$(DEPDIR) ! -rm -f Makefile ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-hdr distclean-tags dvi: dvi-am *************** *** 375,378 **** --- 424,429 ---- dvi-am: + html: html-am + info: info-am *************** *** 390,394 **** maintainer-clean: maintainer-clean-am ! maintainer-clean-am: distclean-am maintainer-clean-generic --- 441,446 ---- maintainer-clean: maintainer-clean-am ! -rm -rf ./$(DEPDIR) ! -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic *************** *** 397,412 **** mostlyclean-am: mostlyclean-compile mostlyclean-generic uninstall-am: uninstall-info-am uninstall-sbinPROGRAMS ! .PHONY: GTAGS all all-am check check-am clean clean-generic \ ! clean-noinstLIBRARIES clean-sbinPROGRAMS distclean \ ! distclean-compile distclean-depend distclean-generic \ ! distclean-hdr distclean-tags 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-sbinPROGRAMS install-strip installcheck installcheck-am \ ! installdirs maintainer-clean maintainer-clean-generic \ ! mostlyclean mostlyclean-compile mostlyclean-generic tags \ ! uninstall uninstall-am uninstall-info-am uninstall-sbinPROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. --- 449,473 ---- mostlyclean-am: mostlyclean-compile mostlyclean-generic + pdf: pdf-am + + pdf-am: + + ps: ps-am + + ps-am: + uninstall-am: uninstall-info-am uninstall-sbinPROGRAMS ! .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ ! clean-noinstLIBRARIES clean-sbinPROGRAMS ctags distclean \ ! distclean-compile distclean-generic distclean-hdr \ ! distclean-tags 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-sbinPROGRAMS install-strip installcheck \ ! installcheck-am installdirs maintainer-clean \ ! maintainer-clean-generic mostlyclean mostlyclean-compile \ ! mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ ! uninstall-am uninstall-info-am uninstall-sbinPROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. Index: Makefile.am =================================================================== RCS file: /cvsroot/ext2resize/ext2resize/src/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile.am 27 Sep 2000 07:25:54 -0000 1.7 --- Makefile.am 17 Feb 2006 11:12:25 -0000 1.8 *************** *** 28,30 **** LIBS = @LIBS@ ! CFLAGS += -Wall -g --- 28,30 ---- LIBS = @LIBS@ ! AM_CFLAGS = -Wall -g |
