Changeset 189

Show
Ignore:
Timestamp:
11/17/06 11:34:24 (2 years ago)
Author:
ludo
Message:

small compilation fixes

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/client/revimage/.depend

    r12 r189  
    1 compress.o: compress.c /usr/include/stdio.h /usr/include/features.h \ 
    2  /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ 
    3  /usr/lib/gcc-lib/i386-linux/2.95.4/include/stddef.h \ 
    4  /usr/include/bits/types.h /usr/include/bits/pthreadtypes.h \ 
    5  /usr/include/bits/sched.h /usr/include/libio.h \ 
    6  /usr/include/_G_config.h /usr/include/wchar.h \ 
    7  /usr/include/bits/wchar.h /usr/include/gconv.h \ 
    8  /usr/lib/gcc-lib/i386-linux/2.95.4/include/stdarg.h \ 
    9  /usr/include/bits/stdio_lim.h /usr/include/bits/stdio.h \ 
    10  /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h \ 
    11  /usr/include/endian.h /usr/include/bits/endian.h \ 
     1compress.o: compress.c config.h /usr/include/stdio.h \ 
     2 /usr/include/features.h /usr/include/sys/cdefs.h \ 
     3 /usr/include/gnu/stubs.h \ 
     4 /usr/lib/gcc-lib/i386-linux/2.95.4/include/stddef.h \ 
     5 /usr/include/bits/types.h /usr/include/bits/pthreadtypes.h \ 
     6 /usr/include/bits/sched.h /usr/include/libio.h \ 
     7 /usr/include/_G_config.h /usr/include/wchar.h \ 
     8 /usr/include/bits/wchar.h /usr/include/gconv.h \ 
     9 /usr/lib/gcc-lib/i386-linux/2.95.4/include/stdarg.h \ 
     10 /usr/include/bits/stdio_lim.h /usr/include/bits/stdio.h \ 
     11 /usr/include/stdlib.h /usr/include/bits/waitflags.h \ 
     12 /usr/include/bits/waitstatus.h /usr/include/endian.h \ 
     13 /usr/include/bits/endian.h /usr/include/xlocale.h \ 
     14 /usr/include/sys/types.h /usr/include/time.h \ 
    1215 /usr/include/sys/select.h /usr/include/bits/select.h \ 
    1316 /usr/include/bits/sigset.h /usr/include/bits/time.h \ 
    1417 /usr/include/sys/sysmacros.h /usr/include/alloca.h \ 
    1518 /usr/include/unistd.h /usr/include/bits/posix_opt.h \ 
     19 /usr/include/bits/environments.h /usr/include/bits/wordsize.h \ 
    1620 /usr/include/bits/confname.h /usr/include/getopt.h \ 
    1721 /usr/include/sys/ioctl.h /usr/include/bits/ioctls.h \ 
    …… 
    3034 /usr/include/linux/cache.h /usr/include/asm/cache.h \ 
    3135 /usr/include/linux/string.h /usr/include/asm/atomic.h \ 
    32  /usr/include/asm/bitops.h compress.h /usr/include/fcntl.h \ 
    33  /usr/include/bits/fcntl.h /usr/include/sys/stat.h \ 
    34  /usr/include/bits/stat.h zlib-1.2.1/zlib.h zlib-1.2.1/zconf.h 
     36 /usr/include/asm/bitops.h /usr/include/string.h \ 
     37 /usr/include/bits/string.h /usr/include/bits/string2.h compress.h \ 
     38 /usr/include/fcntl.h /usr/include/bits/fcntl.h \ 
     39 /usr/include/sys/stat.h /usr/include/bits/stat.h zlib/zlib.h \ 
     40 zlib/zconf.h ui_newt.h /usr/include/errno.h /usr/include/bits/errno.h \ 
     41 /usr/include/linux/errno.h /usr/include/asm/errno.h compress-loop.h 
    3542decompress-bitmap.o: decompress-bitmap.c /usr/include/stdlib.h \ 
    3643 /usr/include/features.h /usr/include/sys/cdefs.h \ 
    …… 
    5562 /usr/include/bits/wordsize.h /usr/include/bits/confname.h \ 
    5663 /usr/include/getopt.h /usr/include/fcntl.h /usr/include/bits/fcntl.h \ 
    57  zlib-1.2.1/zlib.h zlib-1.2.1/zconf.h 
     64 zlib/zlib.h zlib/zconf.h 
    5865decompress-test.o: decompress-test.c /usr/include/stdlib.h \ 
    5966 /usr/include/features.h /usr/include/sys/cdefs.h \ 
    …… 
    8087 /usr/include/dirent.h /usr/include/bits/dirent.h \ 
    8188 /usr/include/bits/posix1_lim.h /usr/include/bits/local_lim.h \ 
    82  /usr/include/linux/limits.h zlib-1.2.1/zlib.h zlib-1.2.1/zconf.h 
     89 /usr/include/linux/limits.h zlib/zlib.h zlib/zconf.h 
    8390decompress.o: decompress.c /usr/include/stdlib.h \ 
    8491 /usr/include/features.h /usr/include/sys/cdefs.h \ 
    …… 
    103110 /usr/include/bits/wordsize.h /usr/include/bits/confname.h \ 
    104111 /usr/include/getopt.h /usr/include/fcntl.h /usr/include/bits/fcntl.h \ 
    105  zlib-1.2.1/zlib.h zlib-1.2.1/zconf.h 
     112 zlib/zlib.h zlib/zconf.h 
    106113image_e2fs.o: image_e2fs.c config.h /usr/include/fcntl.h \ 
    107114 /usr/include/features.h /usr/include/sys/cdefs.h \ 
    …… 
    134141 /usr/include/dirent.h /usr/include/bits/dirent.h \ 
    135142 /usr/include/bits/posix1_lim.h /usr/include/bits/local_lim.h \ 
    136  /usr/include/linux/limits.h compress.h zlib-1.2.1/zlib.h \ 
    137  zlib-1.2.1/zconf.h ui_newt.h /usr/include/errno.h \ 
    138  /usr/include/bits/errno.h /usr/include/linux/errno.h \ 
    139  /usr/include/asm/errno.h compress-loop.h 
     143 /usr/include/linux/limits.h compress.h zlib/zlib.h zlib/zconf.h \ 
     144 ui_newt.h /usr/include/errno.h /usr/include/bits/errno.h \ 
     145 /usr/include/linux/errno.h /usr/include/asm/errno.h 
    140146image_error.o: image_error.c /usr/include/stdlib.h \ 
    141147 /usr/include/features.h /usr/include/sys/cdefs.h \ 
    …… 
    186192 /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \ 
    187193 /usr/include/bits/wordsize.h /usr/include/bits/confname.h \ 
    188  /usr/include/getopt.h compress.h zlib-1.2.1/zlib.h zlib-1.2.1/zconf.h \ 
    189  ui_newt.h /usr/include/errno.h /usr/include/bits/errno.h \ 
    190  /usr/include/linux/errno.h /usr/include/asm/errno.h compress-loop.h 
     194 /usr/include/getopt.h compress.h zlib/zlib.h zlib/zconf.h ui_newt.h \ 
     195 /usr/include/errno.h /usr/include/bits/errno.h \ 
     196 /usr/include/linux/errno.h /usr/include/asm/errno.h 
     197image_lvm.o: image_lvm.c config.h /usr/include/stdio.h \ 
     198 /usr/include/features.h /usr/include/sys/cdefs.h \ 
     199 /usr/include/gnu/stubs.h \ 
     200 /usr/lib/gcc-lib/i386-linux/2.95.4/include/stddef.h \ 
     201 /usr/include/bits/types.h /usr/include/bits/pthreadtypes.h \ 
     202 /usr/include/bits/sched.h /usr/include/libio.h \ 
     203 /usr/include/_G_config.h /usr/include/wchar.h \ 
     204 /usr/include/bits/wchar.h /usr/include/gconv.h \ 
     205 /usr/lib/gcc-lib/i386-linux/2.95.4/include/stdarg.h \ 
     206 /usr/include/bits/stdio_lim.h /usr/include/bits/stdio.h \ 
     207 /usr/include/stdlib.h /usr/include/bits/waitflags.h \ 
     208 /usr/include/bits/waitstatus.h /usr/include/endian.h \ 
     209 /usr/include/bits/endian.h /usr/include/xlocale.h \ 
     210 /usr/include/sys/types.h /usr/include/time.h \ 
     211 /usr/include/sys/select.h /usr/include/bits/select.h \ 
     212 /usr/include/bits/sigset.h /usr/include/bits/time.h \ 
     213 /usr/include/sys/sysmacros.h /usr/include/alloca.h \ 
     214 /usr/include/string.h /usr/include/bits/string.h \ 
     215 /usr/include/bits/string2.h /usr/include/assert.h \ 
     216 /usr/include/sys/mount.h /usr/include/sys/ioctl.h \ 
     217 /usr/include/bits/ioctls.h /usr/include/asm/ioctls.h \ 
     218 /usr/include/asm/ioctl.h /usr/include/bits/ioctl-types.h \ 
     219 /usr/include/sys/ttydefaults.h /usr/include/sys/stat.h \ 
     220 /usr/include/bits/stat.h /usr/include/asm/types.h \ 
     221 /usr/include/errno.h /usr/include/bits/errno.h \ 
     222 /usr/include/linux/errno.h /usr/include/asm/errno.h \ 
     223 /usr/include/mntent.h /usr/include/paths.h /usr/include/unistd.h \ 
     224 /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \ 
     225 /usr/include/bits/wordsize.h /usr/include/bits/confname.h \ 
     226 /usr/include/getopt.h /usr/include/fcntl.h /usr/include/bits/fcntl.h \ 
     227 /usr/include/stdint.h /usr/include/sys/vfs.h \ 
     228 /usr/include/sys/statfs.h /usr/include/bits/statfs.h compress.h \ 
     229 zlib/zlib.h zlib/zconf.h ui_newt.h lvm.h 
     230image_lvmreiserfs.o: image_lvmreiserfs.c config.h /usr/include/stdio.h \ 
     231 /usr/include/features.h /usr/include/sys/cdefs.h \ 
     232 /usr/include/gnu/stubs.h \ 
     233 /usr/lib/gcc-lib/i386-linux/2.95.4/include/stddef.h \ 
     234 /usr/include/bits/types.h /usr/include/bits/pthreadtypes.h \ 
     235 /usr/include/bits/sched.h /usr/include/libio.h \ 
     236 /usr/include/_G_config.h /usr/include/wchar.h \ 
     237 /usr/include/bits/wchar.h /usr/include/gconv.h \ 
     238 /usr/lib/gcc-lib/i386-linux/2.95.4/include/stdarg.h \ 
     239 /usr/include/bits/stdio_lim.h /usr/include/bits/stdio.h \ 
     240 /usr/include/stdlib.h /usr/include/bits/waitflags.h \ 
     241 /usr/include/bits/waitstatus.h /usr/include/endian.h \ 
     242 /usr/include/bits/endian.h /usr/include/xlocale.h \ 
     243 /usr/include/sys/types.h /usr/include/time.h \ 
     244 /usr/include/sys/select.h /usr/include/bits/select.h \ 
     245 /usr/include/bits/sigset.h /usr/include/bits/time.h \ 
     246 /usr/include/sys/sysmacros.h /usr/include/alloca.h \ 
     247 /usr/include/string.h /usr/include/bits/string.h \ 
     248 /usr/include/bits/string2.h /usr/include/assert.h \ 
     249 /usr/include/sys/mount.h /usr/include/sys/ioctl.h \ 
     250 /usr/include/bits/ioctls.h /usr/include/asm/ioctls.h \ 
     251 /usr/include/asm/ioctl.h /usr/include/bits/ioctl-types.h \ 
     252 /usr/include/sys/ttydefaults.h /usr/include/sys/stat.h \ 
     253 /usr/include/bits/stat.h /usr/include/asm/types.h \ 
     254 /usr/include/errno.h /usr/include/bits/errno.h \ 
     255 /usr/include/linux/errno.h /usr/include/asm/errno.h \ 
     256 /usr/include/mntent.h /usr/include/paths.h /usr/include/unistd.h \ 
     257 /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \ 
     258 /usr/include/bits/wordsize.h /usr/include/bits/confname.h \ 
     259 /usr/include/getopt.h /usr/include/fcntl.h /usr/include/bits/fcntl.h \ 
     260 /usr/include/stdint.h /usr/include/sys/vfs.h \ 
     261 /usr/include/sys/statfs.h /usr/include/bits/statfs.h \ 
     262 reiserfsprogs/include/io.h reiserfsprogs/include/misc.h \ 
     263 reiserfsprogs/include/reiserfs_lib.h \ 
     264 reiserfsprogs/include/reiserfs_fs.h \ 
     265 /usr/lib/gcc-lib/i386-linux/2.95.4/include/limits.h \ 
     266 /usr/lib/gcc-lib/i386-linux/2.95.4/include/syslimits.h \ 
     267 /usr/include/limits.h /usr/include/bits/posix1_lim.h \ 
     268 /usr/include/bits/local_lim.h /usr/include/linux/limits.h \ 
     269 /usr/include/bits/posix2_lim.h /usr/include/bits/xopen_lim.h \ 
     270 reiserfsprogs/version.h compress.h zlib/zlib.h zlib/zconf.h ui_newt.h \ 
     271 lvm.h 
    191272image_raw.o: image_raw.c config.h /usr/include/stdio.h \ 
    192273 /usr/include/features.h /usr/include/sys/cdefs.h \ 
    …… 
    228309 /usr/include/bits/environments.h /usr/include/bits/wordsize.h \ 
    229310 /usr/include/bits/confname.h /usr/include/getopt.h compress.h \ 
    230  zlib-1.2.1/zlib.h zlib-1.2.1/zconf.h ui_newt.h /usr/include/errno.h \ 
     311 zlib/zlib.h zlib/zconf.h ui_newt.h /usr/include/errno.h \ 
    231312 /usr/include/bits/errno.h /usr/include/linux/errno.h \ 
    232  /usr/include/asm/errno.h compress-loop.h 
     313 /usr/include/asm/errno.h 
     314image_reiserfs.o: image_reiserfs.c config.h /usr/include/stdio.h \ 
     315 /usr/include/features.h /usr/include/sys/cdefs.h \ 
     316 /usr/include/gnu/stubs.h \ 
     317 /usr/lib/gcc-lib/i386-linux/2.95.4/include/stddef.h \ 
     318 /usr/include/bits/types.h /usr/include/bits/pthreadtypes.h \ 
     319 /usr/include/bits/sched.h /usr/include/libio.h \ 
     320 /usr/include/_G_config.h /usr/include/wchar.h \ 
     321 /usr/include/bits/wchar.h /usr/include/gconv.h \ 
     322 /usr/lib/gcc-lib/i386-linux/2.95.4/include/stdarg.h \ 
     323 /usr/include/bits/stdio_lim.h /usr/include/bits/stdio.h \ 
     324 /usr/include/stdlib.h /usr/include/bits/waitflags.h \ 
     325 /usr/include/bits/waitstatus.h /usr/include/endian.h \ 
     326 /usr/include/bits/endian.h /usr/include/xlocale.h \ 
     327 /usr/include/sys/types.h /usr/include/time.h \ 
     328 /usr/include/sys/select.h /usr/include/bits/select.h \ 
     329 /usr/include/bits/sigset.h /usr/include/bits/time.h \ 
     330 /usr/include/sys/sysmacros.h /usr/include/alloca.h \ 
     331 /usr/include/string.h /usr/include/bits/string.h \ 
     332 /usr/include/bits/string2.h /usr/include/assert.h \ 
     333 /usr/include/sys/mount.h /usr/include/sys/ioctl.h \ 
     334 /usr/include/bits/ioctls.h /usr/include/asm/ioctls.h \ 
     335 /usr/include/asm/ioctl.h /usr/include/bits/ioctl-types.h \ 
     336 /usr/include/sys/ttydefaults.h /usr/include/sys/stat.h \ 
     337 /usr/include/bits/stat.h /usr/include/asm/types.h \ 
     338 /usr/include/errno.h /usr/include/bits/errno.h \ 
     339 /usr/include/linux/errno.h /usr/include/asm/errno.h \ 
     340 /usr/include/mntent.h /usr/include/paths.h /usr/include/unistd.h \ 
     341 /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \ 
     342 /usr/include/bits/wordsize.h /usr/include/bits/confname.h \ 
     343 /usr/include/getopt.h /usr/include/fcntl.h /usr/include/bits/fcntl.h \ 
     344 reiserfsprogs/include/io.h reiserfsprogs/include/misc.h \ 
     345 reiserfsprogs/include/reiserfs_lib.h \ 
     346 reiserfsprogs/include/reiserfs_fs.h \ 
     347 /usr/lib/gcc-lib/i386-linux/2.95.4/include/limits.h \ 
     348 /usr/lib/gcc-lib/i386-linux/2.95.4/include/syslimits.h \ 
     349 /usr/include/limits.h /usr/include/bits/posix1_lim.h \ 
     350 /usr/include/bits/local_lim.h /usr/include/linux/limits.h \ 
     351 /usr/include/bits/posix2_lim.h /usr/include/bits/xopen_lim.h \ 
     352 reiserfsprogs/version.h compress.h zlib/zlib.h zlib/zconf.h ui_newt.h 
    233353image_swap.o: image_swap.c config.h /usr/include/stdio.h \ 
    234354 /usr/include/features.h /usr/include/sys/cdefs.h \ 
    …… 
    254374 /usr/include/bits/confname.h /usr/include/getopt.h \ 
    255375 /usr/include/fcntl.h /usr/include/bits/fcntl.h \ 
    256  /usr/include/sys/stat.h /usr/include/bits/stat.h zlib-1.2.1/zlib.h \ 
    257  zlib-1.2.1/zconf.h ui_newt.h /usr/include/errno.h \ 
    258  /usr/include/bits/errno.h /usr/include/linux/errno.h \ 
    259  /usr/include/asm/errno.h compress-loop.h 
     376 /usr/include/sys/stat.h /usr/include/bits/stat.h zlib/zlib.h \ 
     377 zlib/zconf.h ui_newt.h /usr/include/errno.h /usr/include/bits/errno.h \ 
     378 /usr/include/linux/errno.h /usr/include/asm/errno.h 
    260379image_xfs.o: image_xfs.c config.h /usr/include/stdio.h \ 
    261380 /usr/include/features.h /usr/include/sys/cdefs.h \ 
    …… 
    296415 /usr/include/bits/sockaddr.h /usr/include/asm/socket.h \ 
    297416 /usr/include/asm/sockios.h /usr/include/bits/in.h \ 
    298  /usr/include/bits/byteswap.h compress.h zlib-1.2.1/zlib.h \ 
    299  zlib-1.2.1/zconf.h ui_newt.h /usr/include/errno.h \ 
    300  /usr/include/bits/errno.h /usr/include/linux/errno.h \ 
    301  /usr/include/asm/errno.h image_xfs.h compress-loop.h 
     417 /usr/include/bits/byteswap.h compress.h zlib/zlib.h zlib/zconf.h \ 
     418 ui_newt.h /usr/include/errno.h /usr/include/bits/errno.h \ 
     419 /usr/include/linux/errno.h /usr/include/asm/errno.h image_xfs.h 
     420lvm.o: lvm.c /usr/include/stdio.h /usr/include/features.h \ 
     421 /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \ 
     422 /usr/lib/gcc-lib/i386-linux/2.95.4/include/stddef.h \ 
     423 /usr/include/bits/types.h /usr/include/bits/pthreadtypes.h \ 
     424 /usr/include/bits/sched.h /usr/include/libio.h \ 
     425 /usr/include/_G_config.h /usr/include/wchar.h \ 
     426 /usr/include/bits/wchar.h /usr/include/gconv.h \ 
     427 /usr/lib/gcc-lib/i386-linux/2.95.4/include/stdarg.h \ 
     428 /usr/include/bits/stdio_lim.h /usr/include/bits/stdio.h \ 
     429 /usr/include/stdlib.h /usr/include/bits/waitflags.h \ 
     430 /usr/include/bits/waitstatus.h /usr/include/endian.h \ 
     431 /usr/include/bits/endian.h /usr/include/xlocale.h \ 
     432 /usr/include/sys/types.h /usr/include/time.h \ 
     433 /usr/include/sys/select.h /usr/include/bits/select.h \ 
     434 /usr/include/bits/sigset.h /usr/include/bits/time.h \ 
     435 /usr/include/sys/sysmacros.h /usr/include/alloca.h \ 
     436 /usr/include/string.h /usr/include/bits/string.h \ 
     437 /usr/include/bits/string2.h /usr/include/assert.h \ 
     438 /usr/include/sys/mount.h /usr/include/sys/ioctl.h \ 
     439 /usr/include/bits/ioctls.h /usr/include/asm/ioctls.h \ 
     440 /usr/include/asm/ioctl.h /usr/include/bits/ioctl-types.h \ 
     441 /usr/include/sys/ttydefaults.h /usr/include/sys/stat.h \ 
     442 /usr/include/bits/stat.h /usr/include/asm/types.h \ 
     443 /usr/include/errno.h /usr/include/bits/errno.h \ 
     444 /usr/include/linux/errno.h /usr/include/asm/errno.h \ 
     445 /usr/include/mntent.h /usr/include/paths.h /usr/include/unistd.h \ 
     446 /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \ 
     447 /usr/include/bits/wordsize.h /usr/include/bits/confname.h \ 
     448 /usr/include/getopt.h /usr/include/fcntl.h /usr/include/bits/fcntl.h \ 
     449 /usr/include/stdint.h /usr/include/sys/vfs.h \ 
     450 /usr/include/sys/statfs.h /usr/include/bits/statfs.h ui_newt.h 
    302451ui_newt.o: ui_newt.c config.h /usr/include/stdlib.h \ 
    303452 /usr/include/features.h /usr/include/sys/cdefs.h \ 

  • trunk/client/revimage/Makefile

    r188 r189  
    1414RFSLIBS=-L./reiserfsprogs/lib/ -lcore -lmisc 
    1515 
    16 all: $(OBJ) $(LIBOBJ) liblrs.so.1 image_swap image_lvmreiserfs \ 
     16all: $(OBJ) $(LIBOBJ) liblrs.so.1 liblrs.a image_swap image_lvmreiserfs \ 
    1717 image_e2fs image_xfs image_jfs image_lvm \ 
    1818 decompress decompress-test\ 
    …… 
    5656 
    5757decompress-bitmap: decompress-bitmap.o $(OBJ) 
    58         cc $(CFLAGS) $(LDFLAGS) -o $@ $< -L. -llrs 
     58        cc $(CFLAGS) $(LDFLAGS) -o $@ $< -L. -llrs -lnewt 
    5959 
    6060#image_reiserfs: image_reiserfs.o lvm.o  
    …… 
    7272        ln -sf $@ liblrs.so 
    7373 
     74liblrs.a: $(OBJ) 
     75        ar rc $@ $^ $(ZLIBOBJ) 
     76        ranlib $@ 
     77 
     78 
    7479include .depend 

  • trunk/client/revimage/compress.h

    r154 r189  
    88#include <sys/stat.h> 
    99 
    10 #include "./zlib-1.2.1/zlib.h" 
     10#include "./zlib/zlib.h" 
    1111 
    1212#define OUTBUFF 8192 

  • trunk/client/revimage/zlib/Makefile

    r187 r189  
    5959TEST_OBJS = example.o minigzip.o 
    6060 
    61 all:  
     61all: libz.a 
    6262#example$(EXE) minigzip$(EXE) 
    6363