Index: e2fsprogs-1.41.1/debugfs/Makefile.in =================================================================== --- e2fsprogs-1.41.1.orig/debugfs/Makefile.in 2008-06-17 22:53:42.000000000 -0500 +++ e2fsprogs-1.41.1/debugfs/Makefile.in 2008-09-12 12:50:44.846078360 -0500 @@ -28,15 +28,20 @@ LIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $( $(LIBUUID) DEPLIBS= $(LIBEXT2FS) $(LIBE2P) $(DEPLIBSS) $(LIBCOM_ERR) $(DEPLIBBLKID) $(DEPLIBUUID) +STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBE2P) $(STATIC_LIBSS) $(STATIC_LIBCOM_ERR) \ + $(STATIC_LIBBLKID) $(STATIC_LIBUUID) $(DLOPEN_LIB) +STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBE2P) $(STATIC_LIBSS) $(STATIC_LIBCOM_ERR) \ + $(STATIC_DEPLIBBLKID) $(STATIC_DEPLIBUUID) + .c.o: @echo " CC $<" @$(CC) -c $(ALL_CFLAGS) $< -o $@ all:: $(PROGS) $(MANPAGES) -debugfs: $(DEBUG_OBJS) $(DEPLIBS) +debugfs: $(DEBUG_OBJS) $(STATIC_DEPLIBS) @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o debugfs $(DEBUG_OBJS) $(LIBS) + @$(CC) $(ALL_LDFLAGS) -o debugfs $(DEBUG_OBJS) $(STATIC_LIBS) debug_cmds.c debug_cmds.h: debug_cmds.ct @echo " MK_CMDS $@" Index: e2fsprogs-1.41.1/e2fsck/Makefile.in =================================================================== --- e2fsprogs-1.41.1.orig/e2fsck/Makefile.in 2008-08-24 23:19:56.000000000 -0500 +++ e2fsprogs-1.41.1/e2fsck/Makefile.in 2008-09-12 12:50:44.846078360 -0500 @@ -113,9 +113,9 @@ prof_err.c prof_err.h: prof_err.et @echo " COMPILE_ET prof_err.et" @$(COMPILE_ET) $(srcdir)/prof_err.et -e2fsck: $(OBJS) $(DEPLIBS) +e2fsck: $(OBJS) $(STATIC_DEPLIBS) @echo " LD $@" - @$(LD) $(ALL_LDFLAGS) -o e2fsck $(OBJS) $(LIBS) + @$(LD) $(ALL_LDFLAGS) -o e2fsck $(OBJS) $(STATIC_LIBS) e2fsck.static: $(OBJS) $(STATIC_DEPLIBS) @echo " LD $@" Index: e2fsprogs-1.41.1/misc/Makefile.in =================================================================== --- e2fsprogs-1.41.1.orig/misc/Makefile.in 2008-08-24 23:19:56.000000000 -0500 +++ e2fsprogs-1.41.1/misc/Makefile.in 2008-09-12 12:50:44.846078360 -0500 @@ -64,9 +64,15 @@ STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(ST LIBS_BLKID= $(LIBBLKID) $(LIBUUID) $(LIBEXT2FS) DEPLIBS_BLKID= $(DEPLIBBLKID) $(DEPLIBUUID) $(LIBEXT2FS) +STATIC_LIBS_BLKID= $(STATIC_LIBBLKID) $(STATIC_LIBUUID) +STATIC_DEPLIBS_BLKID= $(STATIC_DEPLIBBLKID) $(STATIC_DEPLIBUUID) + LIBS_E2P= $(LIBE2P) $(LIBCOM_ERR) DEPLIBS_E2P= $(LIBE2P) $(LIBCOM_ERR) +STATIC_LIBS_E2P= $(STATIC_LIBE2P) $(STATIC_LIBCOM_ERR) +STATIC_DEPLIBS_E2P= $(STATIC_LIBE2P) $(STATIC_LIBCOM_ERR) + COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree .c.o: @@ -101,10 +107,10 @@ e2initrd_helper: e2initrd_helper.o $(DEP @$(CC) $(ALL_LDFLAGS) -o e2initrd_helper e2initrd_helper.o $(LIBS) \ $(LIBS_BLKID) $(LIBS_E2P) $(LIBINTL) -tune2fs: $(TUNE2FS_OBJS) $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBS_BLKID) +tune2fs: $(TUNE2FS_OBJS) $(STATIC_DEPLIBS) $(STATIC_DEPLIBS_E2P) $(STATIC_DEPLIBS_BLKID) @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o tune2fs $(TUNE2FS_OBJS) $(LIBS) \ - $(LIBS_BLKID) $(LIBS_E2P) $(LIBINTL) + @$(CC) $(ALL_LDFLAGS) -o tune2fs $(TUNE2FS_OBJS) $(STATIC_LIBS) \ + $(STATIC_LIBS_BLKID) $(STATIC_LIBS_E2P) $(LIBINTL) tune2fs.static: $(TUNE2FS_OBJS) $(STATIC_DEPLIBS) $(STATIC_LIBE2P) $(DEPSTATIC_LIBBLKID) @echo " LD $@" @@ -116,13 +122,13 @@ blkid: $(BLKID_OBJS) $(DEPLIBS_BLKID) @echo " LD $@" @$(CC) $(ALL_LDFLAGS) -o blkid $(BLKID_OBJS) $(LIBS_BLKID) $(LIBINTL) -e2image: $(E2IMAGE_OBJS) $(DEPLIBS) +e2image: $(E2IMAGE_OBJS) $(STATIC_DEPLIBS) @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o e2image $(E2IMAGE_OBJS) $(LIBS) $(LIBINTL) + @$(CC) $(ALL_LDFLAGS) -o e2image $(E2IMAGE_OBJS) $(STATIC_LIBS) $(LIBINTL) -e2undo: $(E2UNDO_OBJS) $(DEPLIBS) +e2undo: $(E2UNDO_OBJS) $(STATIC_DEPLIBS) @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o e2undo $(E2UNDO_OBJS) $(LIBS) $(LIBINTL) + @$(CC) $(ALL_LDFLAGS) -o e2undo $(E2UNDO_OBJS) $(STATIC_LIBS) $(LIBINTL) base_device: base_device.c @echo " LD $@" @@ -137,10 +143,10 @@ mklost+found: $(MKLPF_OBJS) @echo " LD $@" @$(CC) $(ALL_LDFLAGS) -o mklost+found $(MKLPF_OBJS) $(LIBINTL) -mke2fs: $(MKE2FS_OBJS) $(DEPLIBS) $(LIBE2P) $(DEPLIBUUID) $(DEPLIBS_BLKID) +mke2fs: $(MKE2FS_OBJS) $(STATIC_DEPLIBS) $(STATIC_LIBE2P) $(DEPSTATIC_LIBUUID) $(DEPSTATICLIBBLKID) @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o mke2fs $(MKE2FS_OBJS) $(LIBS) $(LIBS_BLKID) \ - $(LIBE2P) $(LIBUUID) $(LIBINTL) + @$(CC) $(ALL_LDFLAGS) -o mke2fs $(MKE2FS_OBJS) $(STATIC_LIBS) $(STATIC_LIBBLKID) \ + $(STATIC_LIBE2P) $(STATIC_LIBUUID) $(LIBINTL) mke2fs.static: $(MKE2FS_OBJS) $(STATIC_DEPLIBS) $(STATIC_LIBE2P) $(DEPSTATIC_LIBUUID) $(DEPSTATIC_LIBBLKID) @echo " LD $@" @@ -164,10 +170,10 @@ uuidd: $(UUIDD_OBJS) $(DEPLIBUUID) @echo " LD $@" @$(CC) $(ALL_LDFLAGS) -o uuidd $(UUIDD_OBJS) $(LIBUUID) $(LIBINTL) -dumpe2fs: $(DUMPE2FS_OBJS) $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBUUID) +dumpe2fs: $(DUMPE2FS_OBJS) $(STATIC_DEPLIBS) $(STATIC_DEPLIBS_E2P) $(STATIC_DEPLIBUUID) @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o dumpe2fs $(DUMPE2FS_OBJS) $(LIBS) \ - $(LIBS_E2P) $(LIBUUID) $(LIBINTL) + @$(CC) $(ALL_LDFLAGS) -o dumpe2fs $(DUMPE2FS_OBJS) $(STATIC_LIBS) \ + $(STATIC_LIBS_E2P) $(STATIC_LIBUUID) $(LIBINTL) fsck: $(FSCK_OBJS) $(DEBLIBS_BLKID) @echo " LD $@" Index: e2fsprogs-1.41.1/resize/Makefile.in =================================================================== --- e2fsprogs-1.41.1.orig/resize/Makefile.in 2007-06-30 07:58:35.000000000 -0500 +++ e2fsprogs-1.41.1/resize/Makefile.in 2008-09-12 12:50:44.846078360 -0500 @@ -39,9 +39,9 @@ STATIC_DEPLIBS= $(STATIC_LIBE2P) $(STATI all:: $(PROGS) $(TEST_PROGS) $(MANPAGES) -resize2fs: $(RESIZE_OBJS) $(DEPLIBS) +resize2fs: $(RESIZE_OBJS) $(STATIC_DEPLIBS) @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o resize2fs $(RESIZE_OBJS) $(LIBS) + @$(CC) $(ALL_LDFLAGS) -o resize2fs $(RESIZE_OBJS) $(STATIC_LIBS) resize2fs.static: $(RESIZE_OBJS) $(STATIC_DEPLIBS) @echo " LD $@"