File e2fsprogs-no_cmd_hiding.patch of Package e2fsprogs
Index: e2fsprogs-1.41.1/lib/Makefile.elf-lib =================================================================== --- e2fsprogs-1.41.1.orig/lib/Makefile.elf-lib 2008-01-01 22:47:01.000000000 +0100 +++ e2fsprogs-1.41.1/lib/Makefile.elf-lib 2008-09-05 14:41:14.000000000 +0200 @@ -15,7 +15,7 @@ all:: image real-subdirs:: Makefile @echo " MKDIR elfshared" - @mkdir -p elfshared + mkdir -p elfshared ELF_LIB = $(ELF_IMAGE).so.$(ELF_VERSION) ELF_SONAME = $(ELF_IMAGE).so.$(ELF_SO_VERSION) Index: e2fsprogs-1.41.1/lib/ext2fs/Makefile.in =================================================================== --- e2fsprogs-1.41.1.orig/lib/ext2fs/Makefile.in 2008-09-01 17:36:59.000000000 +0200 +++ e2fsprogs-1.41.1/lib/ext2fs/Makefile.in 2008-09-05 14:41:14.000000000 +0200 @@ -176,149 +176,118 @@ BSDLIB_INSTALL_DIR = $(root_libdir) all:: ext2fs.pc .c.o: - @echo " CC $<" - @$(CC) $(ALL_CFLAGS) -c $< -o $@ -@PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $< -@CHECKER_CMT@ @$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $< -@ELF_CMT@ @$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $< -@BSDLIB_CMT@ @$(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $< + $(CC) $(ALL_CFLAGS) -c $< -o $@ +@PROFILE_CMT@ $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $< +@CHECKER_CMT@ $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $< +@ELF_CMT@ $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $< +@BSDLIB_CMT@ $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $< COMPILE_ET=../et/compile_et --build-tree DISTFILES= Makefile *.c *.h image ext2_err.et: $(DEP_SUBSTITUTE) $(srcdir)/ext2_err.et.in - @echo " SUBST $@" - @$(SUBSTITUTE) $(srcdir)/ext2_err.et.in ext2_err.et + $(SUBSTITUTE) $(srcdir)/ext2_err.et.in ext2_err.et ext2_err.c ext2_err.h: ext2_err.et - @echo " COMPILE_ET ext2_err.et" - @$(COMPILE_ET) ext2_err.et + $(COMPILE_ET) ext2_err.et ext2fs.pc: $(srcdir)/ext2fs.pc.in $(top_builddir)/config.status - @echo " CONFIG.STATUS $@" - @cd $(top_builddir); CONFIG_FILES=lib/ext2fs/ext2fs.pc ./config.status + cd $(top_builddir); CONFIG_FILES=lib/ext2fs/ext2fs.pc ./config.status tst_badblocks: tst_badblocks.o $(STATIC_LIBEXT2FS) - @echo " LD $@" - @$(CC) -o tst_badblocks tst_badblocks.o $(STATIC_LIBEXT2FS) \ + $(CC) -o tst_badblocks tst_badblocks.o $(STATIC_LIBEXT2FS) \ $(LIBCOM_ERR) tst_icount: $(srcdir)/icount.c $(STATIC_LIBEXT2FS) - @echo " LD $@" - @$(CC) -o tst_icount $(srcdir)/icount.c -DDEBUG $(ALL_CFLAGS) \ + $(CC) -o tst_icount $(srcdir)/icount.c -DDEBUG $(ALL_CFLAGS) \ $(STATIC_LIBEXT2FS) $(LIBCOM_ERR) tst_iscan: tst_iscan.o $(STATIC_LIBEXT2FS) - @echo " LD $@" - @$(CC) -o tst_iscan tst_iscan.o $(STATIC_LIBEXT2FS) $(LIBCOM_ERR) + $(CC) -o tst_iscan tst_iscan.o $(STATIC_LIBEXT2FS) $(LIBCOM_ERR) tst_getsize: tst_getsize.o $(STATIC_LIBEXT2FS) - @echo " LD $@" - @$(CC) -o tst_getsize tst_getsize.o $(STATIC_LIBEXT2FS) \ + $(CC) -o tst_getsize tst_getsize.o $(STATIC_LIBEXT2FS) \ $(LIBCOM_ERR) tst_ismounted: $(srcdir)/ismounted.c $(STATIC_LIBEXT2FS) - @echo " LD $@" - @$(CC) -o tst_ismounted $(srcdir)/ismounted.c -DDEBUG $(ALL_CFLAGS) $(LIBCOM_ERR) + $(CC) -o tst_ismounted $(srcdir)/ismounted.c -DDEBUG $(ALL_CFLAGS) $(LIBCOM_ERR) tst_byteswap: tst_byteswap.o $(STATIC_LIBEXT2FS) - @echo " LD $@" - @$(CC) -o tst_byteswap tst_byteswap.o $(STATIC_LIBEXT2FS) \ + $(CC) -o tst_byteswap tst_byteswap.o $(STATIC_LIBEXT2FS) \ $(LIBCOM_ERR) tst_bitops: tst_bitops.o $(STATIC_LIBEXT2FS) - @echo " LD $@" - @$(CC) -o tst_bitops tst_bitops.o $(ALL_CFLAGS) \ + $(CC) -o tst_bitops tst_bitops.o $(ALL_CFLAGS) \ $(STATIC_LIBEXT2FS) $(LIBCOM_ERR) tst_getsectsize: tst_getsectsize.o $(STATIC_LIBEXT2FS) - @echo " LD $@" - @$(CC) -o tst_sectgetsize tst_getsectsize.o \ + $(CC) -o tst_sectgetsize tst_getsectsize.o \ $(STATIC_LIBEXT2FS) $(LIBCOM_ERR) tst_types: tst_types.o ext2_types.h - @echo " LD $@" - @$(CC) -o tst_types tst_types.o + $(CC) -o tst_types tst_types.o tst_super_size: tst_super_size.o ext2_fs.h - @echo " LD $@" - @$(CC) -o tst_super_size tst_super_size.o + $(CC) -o tst_super_size tst_super_size.o ext2_tdbtool: tdbtool.o - @echo " LD $@" - @$(CC) -o ext2_tdbtool tdbtool.o tdb.o + $(CC) -o ext2_tdbtool tdbtool.o tdb.o extent_dbg.c: $(srcdir)/extent_dbg.ct - @echo " MK_CMDS $<" - @$(MK_CMDS) $(srcdir)/extent_dbg.ct + $(MK_CMDS) $(srcdir)/extent_dbg.ct debug_cmds.c debug_cmds.h: $(top_srcdir)/debugfs/debug_cmds.ct - @echo " MK_CMDS $<@" - @$(MK_CMDS) $(top_srcdir)/debugfs/debug_cmds.ct + $(MK_CMDS) $(top_srcdir)/debugfs/debug_cmds.ct DEBUG_OBJS= debug_cmds.o debugfs.o util.o ncheck.o icheck.o ls.o \ lsdel.o dump.o set_fields.o logdump.o htree.o unused.o debugfs.o: $(top_srcdir)/debugfs/debugfs.c - @echo " CC $<" - @$(CC) $(ALL_CFLAGS) -c $< -o $@ + $(CC) $(ALL_CFLAGS) -c $< -o $@ util.o: $(top_srcdir)/debugfs/util.c - @echo " CC $<" - @$(CC) $(ALL_CFLAGS) -c $< -o $@ + $(CC) $(ALL_CFLAGS) -c $< -o $@ ncheck.o: $(top_srcdir)/debugfs/ncheck.c - @echo " CC $<" - @$(CC) $(ALL_CFLAGS) -c $< -o $@ + $(CC) $(ALL_CFLAGS) -c $< -o $@ icheck.o: $(top_srcdir)/debugfs/icheck.c - @echo " CC $<" - @$(CC) $(ALL_CFLAGS) -c $< -o $@ + $(CC) $(ALL_CFLAGS) -c $< -o $@ ls.o: $(top_srcdir)/debugfs/ls.c - @echo " CC $<" - @$(CC) $(ALL_CFLAGS) -c $< -o $@ + $(CC) $(ALL_CFLAGS) -c $< -o $@ lsdel.o: $(top_srcdir)/debugfs/lsdel.c - @echo " CC $<" - @$(CC) $(ALL_CFLAGS) -c $< -o $@ + $(CC) $(ALL_CFLAGS) -c $< -o $@ dump.o: $(top_srcdir)/debugfs/dump.c - @echo " CC $<" - @$(CC) $(ALL_CFLAGS) -c $< -o $@ + $(CC) $(ALL_CFLAGS) -c $< -o $@ set_fields.o: $(top_srcdir)/debugfs/set_fields.c - @echo " CC $<" - @$(CC) $(ALL_CFLAGS) -c $< -o $@ + $(CC) $(ALL_CFLAGS) -c $< -o $@ logdump.o: $(top_srcdir)/debugfs/logdump.c - @echo " CC $<" - @$(CC) $(ALL_CFLAGS) -c $< -o $@ + $(CC) $(ALL_CFLAGS) -c $< -o $@ htree.o: $(top_srcdir)/debugfs/htree.c - @echo " CC $<" - @$(CC) $(ALL_CFLAGS) -c $< -o $@ + $(CC) $(ALL_CFLAGS) -c $< -o $@ unused.o: $(top_srcdir)/debugfs/unused.c - @echo " CC $<" - @$(CC) $(ALL_CFLAGS) -c $< -o $@ + $(CC) $(ALL_CFLAGS) -c $< -o $@ tst_extents: $(srcdir)/extent.c extent_dbg.c $(DEBUG_OBJS) $(DEPLIBSS) $(LIBE2P) $(DEPLIBUUID) $(DEPLIBBLKID) - @echo " LD $@" - @$(CC) -o tst_extents $(srcdir)/extent.c extent_dbg.c \ + $(CC) -o tst_extents $(srcdir)/extent.c extent_dbg.c \ $(ALL_CFLAGS) -DDEBUG $(DEBUG_OBJS) $(LIBSS) $(LIBE2P) \ $(STATIC_LIBEXT2FS) $(LIBBLKID) $(LIBUUID) $(LIBCOM_ERR) \ -I $(top_srcdir)/debugfs tst_csum: tst_csum.c csum.c $(STATIC_LIBEXT2FS) - @echo " LD $@" - @$(CC) -o tst_csum $(srcdir)/csum.c $(srcdir)/tst_csum.c -DDEBUG \ + $(CC) -o tst_csum $(srcdir)/csum.c $(srcdir)/tst_csum.c -DDEBUG \ $(ALL_CFLAGS) $(STATIC_LIBEXT2FS) $(LIBCOM_ERR) mkjournal: mkjournal.c $(STATIC_LIBEXT2FS) - @echo " LD $@" - @$(CC) -o mkjournal $(srcdir)/mkjournal.c -DDEBUG $(STATIC_LIBEXT2FS) $(LIBCOM_ERR) $(ALL_CFLAGS) + $(CC) -o mkjournal $(srcdir)/mkjournal.c -DDEBUG $(STATIC_LIBEXT2FS) $(LIBCOM_ERR) $(ALL_CFLAGS) check:: tst_bitops tst_badblocks tst_iscan tst_types tst_icount tst_super_size tst_types tst_csum LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_bitops @@ -330,13 +299,11 @@ check:: tst_bitops tst_badblocks tst_isc LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_csum installdirs:: - @echo " MKINSTALLDIRS $(libdir) $(includedir)/ext2fs" - @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ + $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ $(DESTDIR)$(includedir)/ext2fs $(DESTDIR)$(libdir)/pkgconfig install:: all $(HFILES) $(HFILES_IN) installdirs ext2fs.pc - @echo " INSTALL_DATA $(libdir)/libext2fs.a" - @$(INSTALL_DATA) libext2fs.a $(DESTDIR)$(libdir)/libext2fs.a + $(INSTALL_DATA) libext2fs.a $(DESTDIR)$(libdir)/libext2fs.a @-$(RANLIB) $(DESTDIR)$(libdir)/libext2fs.a @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libext2fs.a @for i in $(HFILES); do \ Index: e2fsprogs-1.41.1/lib/blkid/Makefile.in =================================================================== --- e2fsprogs-1.41.1.orig/lib/blkid/Makefile.in 2008-08-28 16:26:31.000000000 +0200 +++ e2fsprogs-1.41.1/lib/blkid/Makefile.in 2008-09-05 14:41:14.000000000 +0200 @@ -54,8 +54,7 @@ LIBS_BLKID= $(STATIC_LIBBLKID) $(STATIC_ DEPLIBS_BLKID= $(DEPSTATIC_LIBBLKID) $(DEPSTATIC_LIBUUID) .c.o: - @echo " CC $<" - @$(CC) $(ALL_CFLAGS) -c $< -o $@ + $(CC) $(ALL_CFLAGS) -c $< -o $@ @PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $< @CHECKER_CMT@ @$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $< @ELF_CMT@ @$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $< @@ -73,57 +72,44 @@ libblkid.3: $(DEP_SUBSTITUTE) $(srcdir)/ @$(SUBSTITUTE_UPTIME) $(srcdir)/libblkid.3.in libblkid.3 tst_cache: $(srcdir)/cache.c $(DEPLIBS_BLKID) - @echo " LD $@" - @$(CC) -o tst_cache -DTEST_PROGRAM $(srcdir)/cache.c $(LIBS_BLKID) $(ALL_CFLAGS) + $(CC) -o tst_cache -DTEST_PROGRAM $(srcdir)/cache.c $(LIBS_BLKID) $(ALL_CFLAGS) tst_dev: $(srcdir)/dev.c $(DEPLIBS_BLKID) - @echo " LD $@" - @$(CC) -o tst_dev -DTEST_PROGRAM $(srcdir)/dev.c $(LIBS_BLKID) $(ALL_CFLAGS) + $(CC) -o tst_dev -DTEST_PROGRAM $(srcdir)/dev.c $(LIBS_BLKID) $(ALL_CFLAGS) tst_devname: $(srcdir)/devname.c $(DEPLIBS_BLKID) - @echo " LD $@" - @$(CC) -o tst_devname -DTEST_PROGRAM $(srcdir)/devname.c $(LIBS_BLKID) $(ALL_CFLAGS) + $(CC) -o tst_devname -DTEST_PROGRAM $(srcdir)/devname.c $(LIBS_BLKID) $(ALL_CFLAGS) tst_devno: $(srcdir)/devno.c $(DEPLIBS_BLKID) - @echo " LD $@" - @$(CC) -o tst_devno -DTEST_PROGRAM $(srcdir)/devno.c $(LIBS_BLKID) $(ALL_CFLAGS) + $(CC) -o tst_devno -DTEST_PROGRAM $(srcdir)/devno.c $(LIBS_BLKID) $(ALL_CFLAGS) tst_getsize: $(srcdir)/getsize.c $(DEPLIBS_BLKID) - @echo " LD $@" - @$(CC) -o tst_getsize -DTEST_PROGRAM $(srcdir)/getsize.c $(LIBS_BLKID) $(ALL_CFLAGS) + $(CC) -o tst_getsize -DTEST_PROGRAM $(srcdir)/getsize.c $(LIBS_BLKID) $(ALL_CFLAGS) tst_probe: $(srcdir)/probe.c $(DEPLIBS_BLKID) - @echo " LD $@" - @$(CC) -o tst_probe -DTEST_PROGRAM $(srcdir)/probe.c $(LIBS_BLKID) $(ALL_CFLAGS) + $(CC) -o tst_probe -DTEST_PROGRAM $(srcdir)/probe.c $(LIBS_BLKID) $(ALL_CFLAGS) tst_read: $(srcdir)/read.c $(DEPLIBS_BLKID) - @echo " LD $@" - @$(CC) -o tst_read -DTEST_PROGRAM $(srcdir)/read.c $(LIBS_BLKID) $(ALL_CFLAGS) + $(CC) -o tst_read -DTEST_PROGRAM $(srcdir)/read.c $(LIBS_BLKID) $(ALL_CFLAGS) tst_resolve: $(srcdir)/resolve.c $(DEPLIBS_BLKID) - @echo " LD $@" - @$(CC) -o tst_resolve -DTEST_PROGRAM $(srcdir)/resolve.c $(LIBS_BLKID) $(ALL_CFLAGS) + $(CC) -o tst_resolve -DTEST_PROGRAM $(srcdir)/resolve.c $(LIBS_BLKID) $(ALL_CFLAGS) tst_save: $(srcdir)/save.c $(DEPLIBS_BLKID) - @echo " LD $@" - @$(CC) -o tst_save -DTEST_PROGRAM $(srcdir)/save.c $(LIBS_BLKID) $(ALL_CFLAGS) + $(CC) -o tst_save -DTEST_PROGRAM $(srcdir)/save.c $(LIBS_BLKID) $(ALL_CFLAGS) tst_tag: $(srcdir)/tag.c $(DEPLIBS_BLKID) - @echo " LD $@" - @$(CC) -o tst_tag -DTEST_PROGRAM $(srcdir)/tag.c $(LIBS_BLKID) $(ALL_CFLAGS) + $(CC) -o tst_tag -DTEST_PROGRAM $(srcdir)/tag.c $(LIBS_BLKID) $(ALL_CFLAGS) tst_types: tst_types.o blkid_types.h - @echo " LD $@" - @$(CC) -o tst_types tst_types.o + $(CC) -o tst_types tst_types.o ../../misc/blkid.o: $(top_srcdir)/misc/blkid.c blkid.h - @echo " CC $@" - @$(CC) $(ALL_CFLAGS) -c $(top_srcdir)/misc/blkid.c \ + $(CC) $(ALL_CFLAGS) -c $(top_srcdir)/misc/blkid.c \ -o ../../misc/blkid.o blkid: ../../misc/blkid.o libblkid.a $(DEPLIBUUID) - @echo " LD $@" - @$(CC) -o blkid ../../misc/blkid.o libblkid.a $(LIBUUID) + $(CC) -o blkid ../../misc/blkid.o libblkid.a $(LIBUUID) test_probe: test_probe.in Makefile @echo "Creating test_probe..." Index: e2fsprogs-1.41.1/lib/e2p/Makefile.in =================================================================== --- e2fsprogs-1.41.1.orig/lib/e2p/Makefile.in 2008-08-30 05:22:54.000000000 +0200 +++ e2fsprogs-1.41.1/lib/e2p/Makefile.in 2008-09-05 14:41:14.000000000 +0200 @@ -53,8 +53,7 @@ BSDLIB_INSTALL_DIR = $(root_libdir) @MAKEFILE_CHECKER@ .c.o: - @echo " CC $<" - @$(CC) $(ALL_CFLAGS) -c $< -o $@ + $(CC) $(ALL_CFLAGS) -c $< -o $@ @PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $< @CHECKER_CMT@ @$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $< @ELF_CMT@ @$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $< @@ -65,8 +64,7 @@ e2p.pc: $(srcdir)/e2p.pc.in $(top_buildd @cd $(top_builddir); CONFIG_FILES=lib/e2p/e2p.pc ./config.status tst_ostype: $(srcdir)/ostype.c - @echo " LD $@" - @$(CC) -DTEST_PROGRAM -I$(top_srcdir)/lib -o tst_ostype \ + $(CC) -DTEST_PROGRAM -I$(top_srcdir)/lib -o tst_ostype \ $(srcdir)/ostype.c $(ALL_CFLAGS) tst_feature: $(srcdir)/feature.c Index: e2fsprogs-1.41.1/lib/ss/Makefile.in =================================================================== --- e2fsprogs-1.41.1.orig/lib/ss/Makefile.in 2008-08-25 06:19:56.000000000 +0200 +++ e2fsprogs-1.41.1/lib/ss/Makefile.in 2008-09-05 14:41:14.000000000 +0200 @@ -37,12 +37,11 @@ MK_CMDS=_SS_DIR_OVERRIDE=. ./mk_cmds XTRA_CFLAGS= -I$(srcdir)/../et .c.o: - @echo " CC $<" - @$(CC) $(ALL_CFLAGS) -c $< -@PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $< -@CHECKER_CMT@ @$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $< -@ELF_CMT@ @$(CC) $(ALL_CFLAGS) -DSHARED_ELF_LIB -fPIC -o elfshared/$*.o -c $< -@BSDLIB_CMT@ @$(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $< + $(CC) $(ALL_CFLAGS) -c $< +@PROFILE_CMT@ $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $< +@CHECKER_CMT@ $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $< +@ELF_CMT@ $(CC) $(ALL_CFLAGS) -DSHARED_ELF_LIB -fPIC -o elfshared/$*.o -c $< +@BSDLIB_CMT@ $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $< # for the library @@ -96,18 +95,15 @@ FILES= $(SRCS) $(MKCMDSFILES) $(HFILES) all:: libss.a ss.pc # libss_p.a lint std_rqs.c: std_rqs.ct mk_cmds - @echo " MK_CMDS $@" - @DIR=$(srcdir) $(MK_CMDS) $(srcdir)/std_rqs.ct + DIR=$(srcdir) $(MK_CMDS) $(srcdir)/std_rqs.ct std_rqs.o: ss_err.h test_cmd.c: test_cmd.ct mk_cmds - @echo " MK_CMDS $@" - @DIR=$(srcdir) $(MK_CMDS) $(srcdir)/test_cmd.ct + DIR=$(srcdir) $(MK_CMDS) $(srcdir)/test_cmd.ct ss_err.c ss_err.h: ss_err.et - @echo " COMPILE_ET ss_err.et" - @$(COMPILE_ET) $(srcdir)/ss_err.et + $(COMPILE_ET) $(srcdir)/ss_err.et ct.tab.c ct.tab.h: ct.y $(RM) -f ct.tab.* y.* @@ -120,17 +116,14 @@ ct.tab.c ct.tab.h: ct.y # $(CHMOD) -x $@ mk_cmds: $(DEP_SUBSTITUTE) $(srcdir)/mk_cmds.sh.in - @echo " SUBST $@" - @$(SUBSTITUTE) $(srcdir)/mk_cmds.sh.in mk_cmds - @$(CHMOD) +x mk_cmds + $(SUBSTITUTE) $(srcdir)/mk_cmds.sh.in mk_cmds + $(CHMOD) +x mk_cmds ss.pc: $(srcdir)/ss.pc.in $(top_builddir)/config.status - @echo " CONFIG.STATUS $@" - @cd $(top_builddir); CONFIG_FILES=lib/ss/ss.pc ./config.status + cd $(top_builddir); CONFIG_FILES=lib/ss/ss.pc ./config.status installdirs:: - @echo " MKINSTALLDIRS $(libdir) $(includedir)/ss $(datadir)/ss $(bindir)" - @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ + $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ $(DESTDIR)$(includedir)/ss $(DESTDIR)$(datadir)/ss \ $(DESTDIR)$(bindir) $(DESTDIR)$(libdir)/pkgconfig @@ -164,8 +157,7 @@ uninstall:: $(RM) -rf $(DESTDIR)$(includedir)/ss $(DESTDIR)$(datadir)/ss test_ss: test_ss.o test_cmd.o $(DEPLIBSS) $(LIBCOM_ERR) - @echo " LD $@" - @$(CC) -o $@ test_ss.o test_cmd.o $(ALL_CFLAGS) \ + $(CC) -o $@ test_ss.o test_cmd.o $(ALL_CFLAGS) \ $(LIBSS) $(LIBCOM_ERR) check:: all test_ss Index: e2fsprogs-1.41.1/lib/uuid/Makefile.in =================================================================== --- e2fsprogs-1.41.1.orig/lib/uuid/Makefile.in 2008-02-19 05:33:10.000000000 +0100 +++ e2fsprogs-1.41.1/lib/uuid/Makefile.in 2008-09-05 14:41:14.000000000 +0200 @@ -60,12 +60,11 @@ BSDLIB_INSTALL_DIR = $(root_libdir) @MAKEFILE_CHECKER@ .c.o: - @echo " CC $<" - @$(CC) $(ALL_CFLAGS) -c $< -o $@ -@PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $< -@CHECKER_CMT@ @$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $< -@ELF_CMT@ @$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $< -@BSDLIB_CMT@ @$(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $< + $(CC) $(ALL_CFLAGS) -c $< -o $@ +@PROFILE_CMT@ $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $< +@CHECKER_CMT@ $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $< +@ELF_CMT@ $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $< +@BSDLIB_CMT@ $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $< all:: tst_uuid uuid_time $(SMANPAGES) uuid.pc @@ -73,53 +72,41 @@ $(top_builddir)/lib/uuid/uuid_types.h: $ cd $(top_builddir); CONFIG_FILES=$(my_dir)/uuid_types.h ./config.status tst_uuid.o: $(srcdir)/tst_uuid.c - @echo " CC $@" - @$(CC) $(ALL_CFLAGS) -c $(srcdir)/tst_uuid.c -o tst_uuid.o + $(CC) $(ALL_CFLAGS) -c $(srcdir)/tst_uuid.c -o tst_uuid.o tst_uuid: tst_uuid.o $(DEPSTATIC_LIBUUID) - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o tst_uuid tst_uuid.o $(STATIC_LIBUUID) + $(CC) $(ALL_LDFLAGS) -o tst_uuid tst_uuid.o $(STATIC_LIBUUID) uuid_time: $(srcdir)/uuid_time.c $(DEPLIBUUID) - @echo " LD $@" - @$(CC) $(ALL_CFLAGS) -DDEBUG -o uuid_time $(srcdir)/uuid_time.c \ + $(CC) $(ALL_CFLAGS) -DDEBUG -o uuid_time $(srcdir)/uuid_time.c \ $(LIBUUID) uuid.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid.3.in - @echo " SUBST $@" - @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid.3.in uuid.3 + $(SUBSTITUTE_UPTIME) $(srcdir)/uuid.3.in uuid.3 uuid_clear.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_clear.3.in - @echo " SUBST $@" - @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_clear.3.in uuid_clear.3 + $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_clear.3.in uuid_clear.3 uuid_compare.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_compare.3.in - @echo " SUBST $@" - @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_compare.3.in uuid_compare.3 + $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_compare.3.in uuid_compare.3 uuid_copy.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_copy.3.in - @echo " SUBST $@" - @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_copy.3.in uuid_copy.3 + $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_copy.3.in uuid_copy.3 uuid_generate.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_generate.3.in - @echo " SUBST $@" - @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_generate.3.in uuid_generate.3 + $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_generate.3.in uuid_generate.3 uuid_is_null.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_is_null.3.in - @echo " SUBST $@" - @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_is_null.3.in uuid_is_null.3 + $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_is_null.3.in uuid_is_null.3 uuid_parse.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_parse.3.in - @echo " SUBST $@" - @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_parse.3.in uuid_parse.3 + $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_parse.3.in uuid_parse.3 uuid_time.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_time.3.in - @echo " SUBST $@" - @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_time.3.in uuid_time.3 + $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_time.3.in uuid_time.3 uuid_unparse.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_unparse.3.in - @echo " SUBST $@" - @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_unparse.3.in uuid_unparse.3 + $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_unparse.3.in uuid_unparse.3 uuid.pc: $(srcdir)/uuid.pc.in $(top_builddir)/config.status @echo " CONFIG.STATUS $@" Index: e2fsprogs-1.41.1/e2fsck/Makefile.in =================================================================== --- e2fsprogs-1.41.1.orig/e2fsck/Makefile.in 2008-09-05 14:41:09.000000000 +0200 +++ e2fsprogs-1.41.1/e2fsck/Makefile.in 2008-09-05 14:44:03.000000000 +0200 @@ -32,9 +32,8 @@ PROFILED_DEPLIBS= $(PROFILED_LIBEXT2FS) COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree .c.o: - @echo " CC $<" - @$(CC) -c $(ALL_CFLAGS) $< -o $@ -@PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $< + $(CC) -c $(ALL_CFLAGS) $< -o $@ +@PROFILE_CMT@ $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $< # # Flags for using Checker @@ -109,43 +108,35 @@ all:: profiled $(PROGS) e2fsck $(MANPAGE @PROFILE_CMT@all:: e2fsck.profiled prof_err.c prof_err.h: prof_err.et - @echo " COMPILE_ET prof_err.et" - @$(COMPILE_ET) $(srcdir)/prof_err.et + $(COMPILE_ET) $(srcdir)/prof_err.et e2fsck: $(OBJS) $(DEPLIBS) - @echo " LD $@" - @$(LD) $(ALL_LDFLAGS) -o e2fsck $(OBJS) $(LIBS) + $(LD) $(ALL_LDFLAGS) -o e2fsck $(OBJS) $(LIBS) e2fsck.static: $(OBJS) $(STATIC_DEPLIBS) - @echo " LD $@" - @$(LD) $(LDFLAGS_STATIC) -o e2fsck.static $(OBJS) $(STATIC_LIBS) + $(LD) $(LDFLAGS_STATIC) -o e2fsck.static $(OBJS) $(STATIC_LIBS) e2fsck.profiled: $(PROFILED_OBJS) $(PROFILED_DEPLIBS) - @echo " LD $@" - @$(LD) $(ALL_LDFLAGS) -g -pg -o e2fsck.profiled $(PROFILED_OBJS) \ + $(LD) $(ALL_LDFLAGS) -g -pg -o e2fsck.profiled $(PROFILED_OBJS) \ $(PROFILED_LIBS) gen_crc32table: $(srcdir)/gen_crc32table.c - @echo " CC $@" - @$(BUILD_CC) $(BUILD_CFLAGS) -o gen_crc32table \ + $(BUILD_CC) $(BUILD_CFLAGS) -o gen_crc32table \ $(srcdir)/gen_crc32table.c crc32table.h: gen_crc32table - @echo " GEN32TABLE $@" - @./gen_crc32table > crc32table.h + ./gen_crc32table > crc32table.h tst_crc32: $(srcdir)/crc32.c $(LIBEXT2FS) - @$(CC) $(BUILD_LDFLAGS) $(ALL_CFLAGS) -o tst_crc32 $(srcdir)/crc32.c \ + $(CC) $(BUILD_LDFLAGS) $(ALL_CFLAGS) -o tst_crc32 $(srcdir)/crc32.c \ -DUNITTEST $(LIBEXT2FS) $(LIBCOM_ERR) tst_refcount: ea_refcount.c - @echo " LD $@" - @$(CC) -o tst_refcount $(srcdir)/ea_refcount.c \ + $(CC) -o tst_refcount $(srcdir)/ea_refcount.c \ $(ALL_CFLAGS) -DTEST_PROGRAM $(LIBCOM_ERR) tst_region: region.c - @echo " LD $@" - @$(CC) -o tst_region $(srcdir)/region.c \ + $(CC) -o tst_region $(srcdir)/region.c \ $(ALL_CFLAGS) -DTEST_PROGRAM $(LIBCOM_ERR) check:: tst_refcount tst_region tst_crc32 @@ -154,21 +145,17 @@ check:: tst_refcount tst_region tst_crc3 LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_crc32 extend: extend.o - @echo " LD $@" - @$(LD) $(ALL_LDFLAGS) -o extend extend.o $(CHECKLIB) + $(LD) $(ALL_LDFLAGS) -o extend extend.o $(CHECKLIB) flushb: flushb.o - @echo " LD $@" - @$(LD) $(ALL_LDFLAGS) -o flushb flushb.o $(CHECKLIB) + $(LD) $(ALL_LDFLAGS) -o flushb flushb.o $(CHECKLIB) iscan: iscan.o util.o ehandler.o $(DEPLIBS) - @echo " LD $@" - @$(LD) $(ALL_LDFLAGS) -o iscan iscan.o util.o ehandler.o $(LIBS) + $(LD) $(ALL_LDFLAGS) -o iscan iscan.o util.o ehandler.o $(LIBS) test_profile: $(srcdir)/profile.c profile_helpers.o argv_parse.o \ prof_err.o profile.h $(STATIC_LIBCOM_ERR) - @echo " LD $@" - @$(CC) -o test_profile -DDEBUG_PROGRAM $(srcdir)/profile.c prof_err.o \ + $(CC) -o test_profile -DDEBUG_PROGRAM $(srcdir)/profile.c prof_err.o \ profile_helpers.o argv_parse.o $(STATIC_LIBCOM_ERR) \ $(ALL_CFLAGS) @@ -177,16 +164,13 @@ profiled: @PROFILE_CMT@ @mkdir profiled e2fsck.8: $(DEP_SUBSTITUTE) $(srcdir)/e2fsck.8.in - @echo " SUBST $@" - @$(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.8.in e2fsck.8 + $(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.8.in e2fsck.8 e2fsck.conf.5: $(DEP_SUBSTITUTE) $(srcdir)/e2fsck.conf.5.in - @echo " SUBST $@" - @$(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.conf.5.in e2fsck.conf.5 + $(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.conf.5.in e2fsck.conf.5 installdirs: - @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)" - @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \ + $(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \ $(DESTDIR)$(man8dir) $(DESTDIR)$(man5dir) install: $(PROGS) $(MANPAGES) $(FMANPAGES) installdirs @@ -194,17 +178,13 @@ install: $(PROGS) $(MANPAGES) $(FMANPAGE echo " INSTALL $(root_sbindir)/$$i"; \ $(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \ done - @echo " LINK $(root_sbindir)/fsck.ext2" - @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ + $(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ $(DESTDIR)$(root_sbindir)/fsck.ext2 - @echo " LINK $(root_sbindir)/fsck.ext3" - @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ + $(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ $(DESTDIR)$(root_sbindir)/fsck.ext3 - @echo " LINK $(root_sbindir)/fsck.ext4" - @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ + $(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ $(DESTDIR)$(root_sbindir)/fsck.ext4 - @echo " LINK $(root_sbindir)/fsck.ext4dev" - @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ + $(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \ $(DESTDIR)$(root_sbindir)/fsck.ext4dev @for i in $(MANPAGES); do \ for j in $(COMPRESS_EXT); do \ @@ -220,17 +200,13 @@ install: $(PROGS) $(MANPAGES) $(FMANPAGE echo " INSTALL_DATA $(man5dir)/$$i"; \ $(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \ done - @echo " LINK $(man8dir)/fsck.ext2.8" - @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ + $(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ $(DESTDIR)$(man8dir)/fsck.ext2.8 - @echo " LINK $(man8dir)/fsck.ext3.8" - @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ + $(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ $(DESTDIR)$(man8dir)/fsck.ext3.8 - @echo " LINK $(man8dir)/fsck.ext4.8" - @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ + $(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ $(DESTDIR)$(man8dir)/fsck.ext4.8 - @echo " LINK $(man8dir)/fsck.ext4.8" - @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ + $(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \ $(DESTDIR)$(man8dir)/fsck.ext4dev.8 install-strip: install Index: e2fsprogs-1.41.1/debugfs/Makefile.in =================================================================== --- e2fsprogs-1.41.1.orig/debugfs/Makefile.in 2008-06-18 05:53:42.000000000 +0200 +++ e2fsprogs-1.41.1/debugfs/Makefile.in 2008-09-05 14:41:14.000000000 +0200 @@ -29,26 +29,21 @@ LIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $( DEPLIBS= $(LIBEXT2FS) $(LIBE2P) $(DEPLIBSS) $(LIBCOM_ERR) $(DEPLIBBLKID) $(DEPLIBUUID) .c.o: - @echo " CC $<" - @$(CC) -c $(ALL_CFLAGS) $< -o $@ + $(CC) -c $(ALL_CFLAGS) $< -o $@ all:: $(PROGS) $(MANPAGES) debugfs: $(DEBUG_OBJS) $(DEPLIBS) - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o debugfs $(DEBUG_OBJS) $(LIBS) + $(CC) $(ALL_LDFLAGS) -o debugfs $(DEBUG_OBJS) $(LIBS) debug_cmds.c debug_cmds.h: debug_cmds.ct - @echo " MK_CMDS $@" - @$(MK_CMDS) $(srcdir)/debug_cmds.ct + $(MK_CMDS) $(srcdir)/debug_cmds.ct debugfs.8: $(DEP_SUBSTITUTE) $(srcdir)/debugfs.8.in - @echo " SUBST $@" - @$(SUBSTITUTE_UPTIME) $(srcdir)/debugfs.8.in debugfs.8 + $(SUBSTITUTE_UPTIME) $(srcdir)/debugfs.8.in debugfs.8 installdirs: - @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)" - @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \ + $(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \ $(DESTDIR)$(man8dir) install: $(PROGS) $(MANPAGES) installdirs Index: e2fsprogs-1.41.1/resize/Makefile.in =================================================================== --- e2fsprogs-1.41.1.orig/resize/Makefile.in 2007-06-30 14:58:35.000000000 +0200 +++ e2fsprogs-1.41.1/resize/Makefile.in 2008-09-05 14:41:14.000000000 +0200 @@ -34,31 +34,25 @@ STATIC_LIBS= $(STATIC_LIBE2P) $(STATIC_L STATIC_DEPLIBS= $(STATIC_LIBE2P) $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) .c.o: - @echo " CC $<" - @$(CC) -c $(ALL_CFLAGS) $< -o $@ + $(CC) -c $(ALL_CFLAGS) $< -o $@ all:: $(PROGS) $(TEST_PROGS) $(MANPAGES) resize2fs: $(RESIZE_OBJS) $(DEPLIBS) - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o resize2fs $(RESIZE_OBJS) $(LIBS) + $(CC) $(ALL_LDFLAGS) -o resize2fs $(RESIZE_OBJS) $(LIBS) resize2fs.static: $(RESIZE_OBJS) $(STATIC_DEPLIBS) - @echo " LD $@" - @$(LD) $(ALL_LDFLAGS) $(LDFLAG_STATIC) -o resize2fs.static \ + $(LD) $(ALL_LDFLAGS) $(LDFLAG_STATIC) -o resize2fs.static \ $(RESIZE_OBJS) $(STATIC_LIBS) resize2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/resize2fs.8.in - @echo " SUBST $@" - @$(SUBSTITUTE_UPTIME) $(srcdir)/resize2fs.8.in resize2fs.8 + $(SUBSTITUTE_UPTIME) $(srcdir)/resize2fs.8.in resize2fs.8 test_extent: $(TEST_EXTENT_OBJS) - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o test_extent $(TEST_EXTENT_OBJS) $(LIBS) + $(CC) $(ALL_LDFLAGS) -o test_extent $(TEST_EXTENT_OBJS) $(LIBS) installdirs: - @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)" - @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \ + $(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \ $(DESTDIR)$(man8dir) install: $(PROGS) $(MANPAGES) installdirs Index: e2fsprogs-1.41.1/util/Makefile.in =================================================================== --- e2fsprogs-1.41.1.orig/util/Makefile.in 2007-06-30 14:58:37.000000000 +0200 +++ e2fsprogs-1.41.1/util/Makefile.in 2008-09-05 14:41:14.000000000 +0200 @@ -14,20 +14,17 @@ SRCS = $(srcdir)/subst.c @MCONFIG@ .c.o: - @echo " CC $<" - @$(BUILD_CC) -c $(BUILD_CFLAGS) $< -o $@ + $(BUILD_CC) -c $(BUILD_CFLAGS) $< -o $@ PROGS= subst all:: $(PROGS) gen-tarball subst: subst.o - @echo " LD $@" - @$(BUILD_CC) $(BUILD_LDFLAGS) -o subst subst.o + $(BUILD_CC) $(BUILD_LDFLAGS) -o subst subst.o copy_sparse: copy_sparse.o - @echo " LD $@" - @$(BUILD_CC) $(BUILD_LDFLAGS) -o copy_sparse copy_sparse.o + $(BUILD_CC) $(BUILD_LDFLAGS) -o copy_sparse copy_sparse.o gen-tarball: $(srcdir)/gen-tarball.in $(top_builddir)/config.status @echo " CONFIG.STATUS $@" Index: e2fsprogs-1.41.1/tests/progs/Makefile.in =================================================================== --- e2fsprogs-1.41.1.orig/tests/progs/Makefile.in 2008-06-18 05:53:42.000000000 +0200 +++ e2fsprogs-1.41.1/tests/progs/Makefile.in 2008-09-05 14:41:14.000000000 +0200 @@ -25,26 +25,21 @@ LIBS= $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR DEPLIBS= $(LIBEXT2FS) $(DEPLIBSS) $(LIBCOM_ERR) .c.o: - @echo " CC $<" - @$(CC) -c $(ALL_CFLAGS) $< -o $@ + $(CC) -c $(ALL_CFLAGS) $< -o $@ all:: $(PROGS) test_rel: $(TEST_REL_OBJS) $(DEPLIBS) - @echo " LD $@" - @$(LD) $(ALL_LDFLAGS) -o test_rel $(TEST_REL_OBJS) $(LIBS) + $(LD) $(ALL_LDFLAGS) -o test_rel $(TEST_REL_OBJS) $(LIBS) test_rel_cmds.c: test_rel_cmds.ct - @echo " MK_CMDS $@" - @$(MK_CMDS) $(srcdir)/test_rel_cmds.ct + $(MK_CMDS) $(srcdir)/test_rel_cmds.ct test_icount: $(TEST_ICOUNT_OBJS) $(DEPLIBS) - @echo " LD $@" - @$(LD) $(ALL_LDFLAGS) -o test_icount $(TEST_ICOUNT_OBJS) $(LIBS) + $(LD) $(ALL_LDFLAGS) -o test_icount $(TEST_ICOUNT_OBJS) $(LIBS) test_icount_cmds.c: test_icount_cmds.ct - @echo " MK_CMDS $@" - @$(MK_CMDS) $(srcdir)/test_icount_cmds.ct + $(MK_CMDS) $(srcdir)/test_icount_cmds.ct clean: $(RM) -f $(PROGS) test_rel_cmds.c test_icount_cmds.c \ Index: e2fsprogs-1.41.1/lib/et/Makefile.in =================================================================== --- e2fsprogs-1.41.1.orig/lib/et/Makefile.in 2008-09-05 14:41:09.000000000 +0200 +++ e2fsprogs-1.41.1/lib/et/Makefile.in 2008-09-05 14:41:14.000000000 +0200 @@ -41,12 +41,11 @@ BSDLIB_INSTALL_DIR = $(root_libdir) # what to build... # .c.o: - @echo " CC $<" - @$(CC) $(ALL_CFLAGS) -c $< -o $@ -@PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $< -@CHECKER_CMT@ @$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $< -@ELF_CMT@ @$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $< -@BSDLIB_CMT@ @$(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $< + $(CC) $(ALL_CFLAGS) -c $< -o $@ +@PROFILE_CMT@ $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $< +@CHECKER_CMT@ $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $< +@ELF_CMT@ $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $< +@BSDLIB_CMT@ $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $< @MAKEFILE_LIBRARY@ @MAKEFILE_ELF@ Index: e2fsprogs-1.41.1/misc/Makefile.in =================================================================== --- e2fsprogs-1.41.1.orig/misc/Makefile.in 2008-09-05 14:41:09.000000000 +0200 +++ e2fsprogs-1.41.1/misc/Makefile.in 2008-09-05 14:47:27.000000000 +0200 @@ -73,200 +73,154 @@ DEPLIBS_E2P= $(LIBE2P) $(LIBCOM_ERR) COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree .c.o: - @echo " CC $<" - @$(CC) -c $(ALL_CFLAGS) $< -o $@ + $(CC) -c $(ALL_CFLAGS) $< -o $@ all:: $(SPROGS) $(UPROGS) $(USPROGS) $(SMANPAGES) $(UMANPAGES) \ $(FMANPAGES) $(LPROGS) prof_err.c prof_err.h: $(srcdir)/../e2fsck/prof_err.et - @echo " COMPILE_ET prof_err.et" - @$(COMPILE_ET) $(srcdir)/../e2fsck/prof_err.et + $(COMPILE_ET) $(srcdir)/../e2fsck/prof_err.et default_profile.c: $(srcdir)/mke2fs.conf $(srcdir)/profile-to-c.awk - @echo " PROFILE_TO_C mke2fs.conf" - @$(AWK) -f $(srcdir)/profile-to-c.awk < $(srcdir)/mke2fs.conf \ + $(AWK) -f $(srcdir)/profile-to-c.awk < $(srcdir)/mke2fs.conf \ > default_profile.c profile.o: - @echo " CC $<" - @$(CC) -c $(ALL_CFLAGS) $(srcdir)/../e2fsck/profile.c -o $@ + $(CC) -c $(ALL_CFLAGS) $(srcdir)/../e2fsck/profile.c -o $@ findsuper: findsuper.o - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o findsuper findsuper.o + $(CC) $(ALL_LDFLAGS) -o findsuper findsuper.o partinfo: partinfo.o - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o partinfo partinfo.o + $(CC) $(ALL_LDFLAGS) -o partinfo partinfo.o e2initrd_helper: e2initrd_helper.o $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBS_BLKID) - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o e2initrd_helper e2initrd_helper.o $(LIBS) \ + $(CC) $(ALL_LDFLAGS) -o e2initrd_helper e2initrd_helper.o $(LIBS) \ $(LIBS_BLKID) $(LIBS_E2P) $(LIBINTL) tune2fs: $(TUNE2FS_OBJS) $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBS_BLKID) - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o tune2fs $(TUNE2FS_OBJS) $(LIBS) \ + $(CC) $(ALL_LDFLAGS) -o tune2fs $(TUNE2FS_OBJS) $(LIBS) \ $(LIBS_BLKID) $(LIBS_E2P) $(LIBINTL) tune2fs.static: $(TUNE2FS_OBJS) $(STATIC_DEPLIBS) $(STATIC_LIBE2P) $(DEPSTATIC_LIBBLKID) - @echo " LD $@" - @$(CC) $(LDFLAGS_STATIC) -o tune2fs.static $(TUNE2FS_OBJS) \ + $(CC) $(LDFLAGS_STATIC) -o tune2fs.static $(TUNE2FS_OBJS) \ $(STATIC_LIBS) $(STATIC_LIBBLKID) $(STATIC_LIBUUID) \ $(STATIC_LIBE2P) $(LIBINTL) blkid: $(BLKID_OBJS) $(DEPLIBS_BLKID) - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o blkid $(BLKID_OBJS) $(LIBS_BLKID) $(LIBINTL) + $(CC) $(ALL_LDFLAGS) -o blkid $(BLKID_OBJS) $(LIBS_BLKID) $(LIBINTL) e2image: $(E2IMAGE_OBJS) $(DEPLIBS) - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o e2image $(E2IMAGE_OBJS) $(LIBS) $(LIBINTL) + $(CC) $(ALL_LDFLAGS) -o e2image $(E2IMAGE_OBJS) $(LIBS) $(LIBINTL) e2undo: $(E2UNDO_OBJS) $(DEPLIBS) - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o e2undo $(E2UNDO_OBJS) $(LIBS) $(LIBINTL) + $(CC) $(ALL_LDFLAGS) -o e2undo $(E2UNDO_OBJS) $(LIBS) $(LIBINTL) base_device: base_device.c - @echo " LD $@" - @$(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(srcdir)/base_device.c \ + $(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(srcdir)/base_device.c \ -DDEBUG -o base_device mklost+found: $(MKLPF_OBJS) - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o mklost+found $(MKLPF_OBJS) $(LIBINTL) + $(CC) $(ALL_LDFLAGS) -o mklost+found $(MKLPF_OBJS) $(LIBINTL) mke2fs: $(MKE2FS_OBJS) $(DEPLIBS) $(LIBE2P) $(DEPLIBUUID) $(DEPLIBS_BLKID) - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o mke2fs $(MKE2FS_OBJS) $(LIBS) $(LIBS_BLKID) \ + $(CC) $(ALL_LDFLAGS) -o mke2fs $(MKE2FS_OBJS) $(LIBS) $(LIBS_BLKID) \ $(LIBE2P) $(LIBUUID) $(LIBINTL) mke2fs.static: $(MKE2FS_OBJS) $(STATIC_DEPLIBS) $(STATIC_LIBE2P) $(DEPSTATIC_LIBUUID) $(DEPSTATIC_LIBBLKID) - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -static -o mke2fs.static $(MKE2FS_OBJS) \ + $(CC) $(ALL_LDFLAGS) -static -o mke2fs.static $(MKE2FS_OBJS) \ $(STATIC_LIBS) $(STATIC_LIBE2P) $(STATIC_LIBBLKID) \ $(STATIC_LIBUUID) $(LIBINTL) chattr: $(CHATTR_OBJS) $(DEPLIBS_E2P) - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o chattr $(CHATTR_OBJS) $(LIBS_E2P) $(LIBINTL) + $(CC) $(ALL_LDFLAGS) -o chattr $(CHATTR_OBJS) $(LIBS_E2P) $(LIBINTL) lsattr: $(LSATTR_OBJS) $(DEPLIBS_E2P) - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o lsattr $(LSATTR_OBJS) $(LIBS_E2P) $(LIBINTL) + $(CC) $(ALL_LDFLAGS) -o lsattr $(LSATTR_OBJS) $(LIBS_E2P) $(LIBINTL) uuidgen: $(UUIDGEN_OBJS) $(DEPLIBUUID) - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o uuidgen $(UUIDGEN_OBJS) $(LIBUUID) $(LIBINTL) + $(CC) $(ALL_LDFLAGS) -o uuidgen $(UUIDGEN_OBJS) $(LIBUUID) $(LIBINTL) uuidd: $(UUIDD_OBJS) $(DEPLIBUUID) - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o uuidd $(UUIDD_OBJS) $(LIBUUID) $(LIBINTL) + $(CC) $(ALL_LDFLAGS) -o uuidd $(UUIDD_OBJS) $(LIBUUID) $(LIBINTL) dumpe2fs: $(DUMPE2FS_OBJS) $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBUUID) - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o dumpe2fs $(DUMPE2FS_OBJS) $(LIBS) \ + $(CC) $(ALL_LDFLAGS) -o dumpe2fs $(DUMPE2FS_OBJS) $(LIBS) \ $(LIBS_E2P) $(LIBUUID) $(LIBINTL) fsck: $(FSCK_OBJS) $(DEBLIBS_VOLID) - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBS_VOLID) $(LIBINTL) + $(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBS_VOLID) $(LIBINTL) badblocks: $(BADBLOCKS_OBJS) $(DEPLIBS) - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o badblocks $(BADBLOCKS_OBJS) $(LIBS) $(LIBINTL) + $(CC) $(ALL_LDFLAGS) -o badblocks $(BADBLOCKS_OBJS) $(LIBS) $(LIBINTL) logsave: logsave.o - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o logsave logsave.o + $(CC) $(ALL_LDFLAGS) -o logsave logsave.o filefrag: $(FILEFRAG_OBJS) - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o filefrag $(FILEFRAG_OBJS) + $(CC) $(ALL_LDFLAGS) -o filefrag $(FILEFRAG_OBJS) tst_ismounted: $(srcdir)/ismounted.c $(STATIC_LIBEXT2FS) - @echo " LD $@" $(CC) -o tst_ismounted $(srcdir)/ismounted.c -DDEBUG $(ALL_CFLAGS) $(LIBCOM_ERR) tune2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/tune2fs.8.in - @echo " SUBST $@" - @$(SUBSTITUTE_UPTIME) $(srcdir)/tune2fs.8.in tune2fs.8 + $(SUBSTITUTE_UPTIME) $(srcdir)/tune2fs.8.in tune2fs.8 mklost+found.8: $(DEP_SUBSTITUTE) $(srcdir)/mklost+found.8.in - @echo " SUBST $@" - @$(SUBSTITUTE_UPTIME) $(srcdir)/mklost+found.8.in mklost+found.8 + $(SUBSTITUTE_UPTIME) $(srcdir)/mklost+found.8.in mklost+found.8 mke2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/mke2fs.8.in - @echo " SUBST $@" - @$(SUBSTITUTE_UPTIME) $(srcdir)/mke2fs.8.in mke2fs.8 + $(SUBSTITUTE_UPTIME) $(srcdir)/mke2fs.8.in mke2fs.8 mke2fs.conf.5: $(DEP_SUBSTITUTE) $(srcdir)/mke2fs.conf.5.in - @echo " SUBST $@" - @$(SUBSTITUTE_UPTIME) $(srcdir)/mke2fs.conf.5.in mke2fs.conf.5 + $(SUBSTITUTE_UPTIME) $(srcdir)/mke2fs.conf.5.in mke2fs.conf.5 e2label.8: $(DEP_SUBSTITUTE) $(srcdir)/e2label.8.in - @echo " SUBST $@" - @$(SUBSTITUTE_UPTIME) $(srcdir)/e2label.8.in e2label.8 + $(SUBSTITUTE_UPTIME) $(srcdir)/e2label.8.in e2label.8 e2undo.8: $(DEP_SUBSTITUTE) $(srcdir)/e2undo.8.in - @echo " SUBST $@" - @$(SUBSTITUTE_UPTIME) $(srcdir)/e2undo.8.in e2undo.8 + $(SUBSTITUTE_UPTIME) $(srcdir)/e2undo.8.in e2undo.8 findfs.8: $(DEP_SUBSTITUTE) $(srcdir)/findfs.8.in - @echo " SUBST $@" - @$(SUBSTITUTE_UPTIME) $(srcdir)/findfs.8.in findfs.8 + $(SUBSTITUTE_UPTIME) $(srcdir)/findfs.8.in findfs.8 e2image.8: $(DEP_SUBSTITUTE) $(srcdir)/e2image.8.in - @echo " SUBST $@" - @$(SUBSTITUTE_UPTIME) $(srcdir)/e2image.8.in e2image.8 + $(SUBSTITUTE_UPTIME) $(srcdir)/e2image.8.in e2image.8 dumpe2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/dumpe2fs.8.in - @echo " SUBST $@" - @$(SUBSTITUTE_UPTIME) $(srcdir)/dumpe2fs.8.in dumpe2fs.8 + $(SUBSTITUTE_UPTIME) $(srcdir)/dumpe2fs.8.in dumpe2fs.8 badblocks.8: $(DEP_SUBSTITUTE) $(srcdir)/badblocks.8.in - @echo " SUBST $@" - @$(SUBSTITUTE_UPTIME) $(srcdir)/badblocks.8.in badblocks.8 + $(SUBSTITUTE_UPTIME) $(srcdir)/badblocks.8.in badblocks.8 fsck.8: $(DEP_SUBSTITUTE) $(srcdir)/fsck.8.in - @echo " SUBST $@" - @$(SUBSTITUTE_UPTIME) $(srcdir)/fsck.8.in fsck.8 + $(SUBSTITUTE_UPTIME) $(srcdir)/fsck.8.in fsck.8 blkid.8: $(DEP_SUBSTITUTE) $(srcdir)/blkid.8.in - @echo " SUBST $@" - @$(SUBSTITUTE_UPTIME) $(srcdir)/blkid.8.in blkid.8 + $(SUBSTITUTE_UPTIME) $(srcdir)/blkid.8.in blkid.8 logsave.8: $(DEP_SUBSTITUTE) $(srcdir)/logsave.8.in - @echo " SUBST $@" - @$(SUBSTITUTE_UPTIME) $(srcdir)/logsave.8.in logsave.8 + $(SUBSTITUTE_UPTIME) $(srcdir)/logsave.8.in logsave.8 uuidd.8: $(DEP_SUBSTITUTE) $(srcdir)/uuidd.8.in - @echo " SUBST $@" - @$(SUBSTITUTE_UPTIME) $(srcdir)/uuidd.8.in uuidd.8 + $(SUBSTITUTE_UPTIME) $(srcdir)/uuidd.8.in uuidd.8 chattr.1: $(DEP_SUBSTITUTE) $(srcdir)/chattr.1.in - @echo " SUBST $@" - @$(SUBSTITUTE_UPTIME) $(srcdir)/chattr.1.in chattr.1 + $(SUBSTITUTE_UPTIME) $(srcdir)/chattr.1.in chattr.1 lsattr.1: $(DEP_SUBSTITUTE) $(srcdir)/lsattr.1.in - @echo " SUBST $@" - @$(SUBSTITUTE_UPTIME) $(srcdir)/lsattr.1.in lsattr.1 + $(SUBSTITUTE_UPTIME) $(srcdir)/lsattr.1.in lsattr.1 uuidgen.1: $(DEP_SUBSTITUTE) $(srcdir)/uuidgen.1.in - @echo " SUBST $@" - @$(SUBSTITUTE_UPTIME) $(srcdir)/uuidgen.1.in uuidgen.1 + $(SUBSTITUTE_UPTIME) $(srcdir)/uuidgen.1.in uuidgen.1 blkid.1: $(DEP_SUBSTITUTE) $(srcdir)/blkid.1.in - @echo " SUBST $@" - @$(SUBSTITUTE_UPTIME) $(srcdir)/blkid.1.in blkid.1 + $(SUBSTITUTE_UPTIME) $(srcdir)/blkid.1.in blkid.1 filefrag.8: $(DEP_SUBSTITUTE) $(srcdir)/filefrag.8.in - @echo " SUBST $@" - @$(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8 + $(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8 installdirs: - @echo " MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)" - @$(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \ + $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \ $(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \ $(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) \ $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \ @@ -281,23 +235,17 @@ install: all $(SMANPAGES) $(UMANPAGES) i echo " INSTALL $(sbindir)/$$i"; \ $(INSTALL_PROGRAM) $$i $(DESTDIR)$(sbindir)/$$i; \ done - @echo " LINK $(root_sbindir)/mkfs.ext2" - @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ + $(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ $(DESTDIR)$(root_sbindir)/mkfs.ext2 - @echo " LINK $(root_sbindir)/mkfs.ext3" - @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ + $(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ $(DESTDIR)$(root_sbindir)/mkfs.ext3 - @echo " LINK $(root_sbindir)/mkfs.ext4" - @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ + $(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ $(DESTDIR)$(root_sbindir)/mkfs.ext4 - @echo " LINK $(root_sbindir)/mkfs.ext4dev" - @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ + $(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \ $(DESTDIR)$(root_sbindir)/mkfs.ext4dev - @echo " LINK $(root_sbindir)/e2label" - @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \ + $(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \ $(DESTDIR)$(root_sbindir)/e2label - @echo " LINK $(root_sbindir)/findfs" - @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \ + $(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \ $(DESTDIR)$(root_sbindir)/findfs @for i in $(UPROGS); do \ echo " INSTALL $(bindir)/$$i"; \ @@ -316,17 +264,13 @@ install: all $(SMANPAGES) $(UMANPAGES) i done @$(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8.gz \ $(DESTDIR)$(man8dir)/mkfs.ext3.8.gz - @echo " LINK mkfs.ext2.8" - @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ + $(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ $(DESTDIR)$(man8dir)/mkfs.ext2.8 - @echo " LINK mkfs.ext3.8" - @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ + $(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ $(DESTDIR)$(man8dir)/mkfs.ext3.8 - @echo " LINK mkfs.ext4.8" - @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ + $(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ $(DESTDIR)$(man8dir)/mkfs.ext4.8 - @echo " LINK mkfs.ext4dev.8" - @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ + $(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \ $(DESTDIR)$(man8dir)/mkfs.ext4dev.8 @for i in $(UMANPAGES); do \ for j in $(COMPRESS_EXT); do \
