1481 lines
54 KiB
Diff
1481 lines
54 KiB
Diff
Index: debugfs/Makefile.in
|
|
===================================================================
|
|
--- debugfs/Makefile.in.orig
|
|
+++ debugfs/Makefile.in
|
|
@@ -30,34 +30,29 @@ LIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(
|
|
DEPLIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(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
|
|
- @for i in $(PROGS); do \
|
|
+ for i in $(PROGS); do \
|
|
echo " INSTALL $(root_sbindir)/$$i"; \
|
|
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \
|
|
done
|
|
- @for i in $(MANPAGES); do \
|
|
+ for i in $(MANPAGES); do \
|
|
for j in $(COMPRESS_EXT); do \
|
|
$(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \
|
|
done; \
|
|
@@ -66,7 +61,7 @@ install: $(PROGS) $(MANPAGES) installdir
|
|
done
|
|
|
|
install-strip: install
|
|
- @for i in $(PROGS); do \
|
|
+ for i in $(PROGS); do \
|
|
echo " STRIP $(root_sbindir)/$$i"; \
|
|
$(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \
|
|
done
|
|
Index: doc/Makefile.in
|
|
===================================================================
|
|
--- doc/Makefile.in.orig
|
|
+++ doc/Makefile.in
|
|
@@ -19,26 +19,22 @@ HTML=texi2html
|
|
all:: libext2fs.info libext2fs.dvi
|
|
|
|
install-doc-libs:
|
|
- @$(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*
|
|
- @echo " MKINSTALLDIRS $(infodir)"
|
|
- @$(MKINSTALLDIRS) $(DESTDIR)$(infodir)
|
|
- @for i in libext2fs.info* ; do \
|
|
+ $(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*
|
|
+ $(MKINSTALLDIRS) $(DESTDIR)$(infodir)
|
|
+ for i in libext2fs.info* ; do \
|
|
echo " INSTALL_DATA $(infodir)/$$i" ; \
|
|
$(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \
|
|
done
|
|
- @echo " GZIP $(infodir)/libext2fs.info*"
|
|
- @gzip -9 $(DESTDIR)$(infodir)/libext2fs.info*
|
|
+ gzip -9 $(DESTDIR)$(infodir)/libext2fs.info*
|
|
|
|
uninstall-doc-libs:
|
|
$(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*
|
|
|
|
libext2fs.info: $(srcdir)/libext2fs.texinfo
|
|
- @echo " MAKEINFO $@"
|
|
- -@$(INFO) $(srcdir)/libext2fs.texinfo
|
|
+ -$(INFO) $(srcdir)/libext2fs.texinfo
|
|
|
|
libext2fs.dvi: $(srcdir)/libext2fs.texinfo
|
|
- @echo " TEXI2DVI $@"
|
|
- -@$(DVI) $(srcdir)/libext2fs.texinfo
|
|
+ -$(DVI) $(srcdir)/libext2fs.texinfo
|
|
|
|
.PHONY: distclean
|
|
distclean:: clean
|
|
Index: e2fsck/Makefile.in
|
|
===================================================================
|
|
--- e2fsck/Makefile.in.orig
|
|
+++ e2fsck/Makefile.in
|
|
@@ -33,9 +33,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,107 +108,88 @@ all:: profiled $(PROGS) e2fsck.shared $(
|
|
@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: e2fsck.@E2FSCK_TYPE@
|
|
- @echo " CP $@"
|
|
- @$(CP) e2fsck.@E2FSCK_TYPE@ e2fsck
|
|
+ $(CP) e2fsck.@E2FSCK_TYPE@ e2fsck
|
|
|
|
e2fsck.static: $(OBJS) $(STATIC_DEPLIBS)
|
|
- @echo " LD $@"
|
|
- @$(LD) $(ALL_LDFLAGS) $(LDFLAG_STATIC) -o e2fsck.static $(OBJS) \
|
|
+ $(LD) $(ALL_LDFLAGS) $(LDFLAG_STATIC) -o e2fsck.static $(OBJS) \
|
|
$(STATIC_LIBS)
|
|
|
|
e2fsck.shared: $(OBJS) $(DEPLIBS)
|
|
- @echo " LD $@"
|
|
- @$(LD) $(ALL_LDFLAGS) -o e2fsck.shared $(OBJS) $(LIBS)
|
|
+ $(LD) $(ALL_LDFLAGS) -o e2fsck.shared $(OBJS) $(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)
|
|
|
|
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 -lcom_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 -lcom_err
|
|
|
|
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)
|
|
|
|
profiled:
|
|
-@PROFILE_CMT@ @echo " MKDIR $@"
|
|
-@PROFILE_CMT@ @mkdir profiled
|
|
+@PROFILE_CMT@@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) installdirs
|
|
- @for i in $(PROGS); do \
|
|
+ for i in $(PROGS); do \
|
|
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
|
|
- @for i in $(MANPAGES); do \
|
|
+ for i in $(MANPAGES); do \
|
|
for j in $(COMPRESS_EXT); do \
|
|
$(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \
|
|
done; \
|
|
echo " INSTALL_DATA $(man8dir)/$$i"; \
|
|
$(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \
|
|
done
|
|
- @for i in $(FMANPAGES); do \
|
|
+ for i in $(FMANPAGES); do \
|
|
for j in $(COMPRESS_EXT); do \
|
|
$(RM) -f $(DESTDIR)$(man5dir)/$$i.$$j; \
|
|
done; \
|
|
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
|
|
|
|
install-strip: install
|
|
- @for i in $(PROGS); do \
|
|
+ for i in $(PROGS); do \
|
|
echo " STRIP $(root_sbindir)/$$i"; \
|
|
$(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \
|
|
done
|
|
Index: intl/Makefile.in
|
|
===================================================================
|
|
--- intl/Makefile.in.orig
|
|
+++ intl/Makefile.in
|
|
@@ -146,11 +146,9 @@ all-no-yes: libgnuintl.$la
|
|
all-no-no:
|
|
|
|
libintl.a libgnuintl.a: $(OBJECTS)
|
|
- @rm -f $@
|
|
- @echo " AR $@"
|
|
- @$(AR) cru $@ $(OBJECTS)
|
|
- @echo " RANLIB $@"
|
|
- @$(RANLIB) $@
|
|
+ rm -f $@
|
|
+ $(AR) cru $@ $(OBJECTS)
|
|
+ $(RANLIB) $@
|
|
|
|
libintl.la libgnuintl.la: $(OBJECTS)
|
|
$(LIBTOOL) --mode=link \
|
|
@@ -173,8 +171,7 @@ LTV_AGE=4
|
|
.SUFFIXES: .c .y .o .lo .sin .sed
|
|
|
|
.c.o:
|
|
- @echo " CC $<"
|
|
- @$(COMPILE) $<
|
|
+ $(COMPILE) $<
|
|
|
|
.y.c:
|
|
$(YACC) $(YFLAGS) --output $@ $<
|
|
@@ -228,32 +225,27 @@ intl-compat.lo: $(srcdir)/intl-compat.c
|
|
$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/intl-compat.c
|
|
|
|
ref-add.sed: $(srcdir)/ref-add.sin
|
|
- @echo " SED ref-add.sed"
|
|
- @sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-add.sin > t-ref-add.sed
|
|
- @mv t-ref-add.sed ref-add.sed
|
|
+ sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-add.sin > t-ref-add.sed
|
|
+ mv t-ref-add.sed ref-add.sed
|
|
ref-del.sed: $(srcdir)/ref-del.sin
|
|
- @echo " SED ref-del.sed"
|
|
- @sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-del.sin > t-ref-del.sed
|
|
- @mv t-ref-del.sed ref-del.sed
|
|
+ sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-del.sin > t-ref-del.sed
|
|
+ mv t-ref-del.sed ref-del.sed
|
|
|
|
INCLUDES = -I. -I$(srcdir) -I..
|
|
|
|
libgnuintl.h: $(srcdir)/libgnuintl.h.in
|
|
- @echo " SED libgnuintl.h "
|
|
- @sed -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \
|
|
+ sed -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \
|
|
-e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \
|
|
-e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \
|
|
-e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \
|
|
< $(srcdir)/libgnuintl.h.in > libgnuintl.h
|
|
|
|
libintl.h: libgnuintl.h
|
|
- @echo " CP libintl.h"
|
|
- @cp libgnuintl.h libintl.h
|
|
+ cp libgnuintl.h libintl.h
|
|
|
|
charset.alias: $(srcdir)/config.charset
|
|
- @echo " CONFIG.CHARSET $@"
|
|
- @$(SHELL) $(srcdir)/config.charset '@host@' > t-$@
|
|
- @mv t-$@ $@
|
|
+ $(SHELL) $(srcdir)/config.charset '@host@' > t-$@
|
|
+ mv t-$@ $@
|
|
|
|
check: all
|
|
|
|
@@ -264,7 +256,7 @@ check: all
|
|
# package, you have to use `configure --with-included-gettext'.
|
|
install: install-exec install-data
|
|
install-exec: all
|
|
- @if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
|
|
+ if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
|
|
&& test '@USE_INCLUDED_LIBINTL@' = yes; then \
|
|
$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
|
|
$(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \
|
|
@@ -279,7 +271,7 @@ install-exec: all
|
|
else \
|
|
: ; \
|
|
fi
|
|
- @if test "$(PACKAGE)" = "gettext-tools" \
|
|
+ if test "$(PACKAGE)" = "gettext-tools" \
|
|
&& test '@USE_INCLUDED_LIBINTL@' = no; then \
|
|
$(mkinstalldirs) $(DESTDIR)$(libdir); \
|
|
$(LIBTOOL) --mode=install \
|
|
@@ -321,7 +313,7 @@ install-exec: all
|
|
: ; \
|
|
fi
|
|
install-data: all
|
|
- @if test "$(PACKAGE)" = "gettext-tools"; then \
|
|
+ if test "$(PACKAGE)" = "gettext-tools"; then \
|
|
$(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
|
|
$(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
|
|
$(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \
|
|
@@ -474,8 +466,6 @@ distclean: clean
|
|
fi
|
|
|
|
maintainer-clean: distclean
|
|
- @echo "This command is intended for maintainers to use;"
|
|
- @echo "it deletes files that may require special tools to rebuild."
|
|
|
|
|
|
# GNU gettext needs not contain the file `VERSION' but contains some
|
|
Index: lib/blkid/Makefile.in
|
|
===================================================================
|
|
--- lib/blkid/Makefile.in.orig
|
|
+++ lib/blkid/Makefile.in
|
|
@@ -1,4 +1,4 @@
|
|
-# Makefile for libblkid
|
|
+
|
|
#
|
|
# Copyright (C) 2001 Theodore Ts'o (tytso@mit.edu)
|
|
#
|
|
@@ -54,83 +54,64 @@ LIBS_BLKID= $(STATIC_LIBBLKID) $(STATIC_
|
|
DEPLIBS_BLKID= $(DEPSTATIC_LIBBLKID) $(DEPSTATIC_LIBUUID)
|
|
|
|
.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:: $(SMANPAGES) blkid.pc
|
|
|
|
$(top_builddir)/lib/blkid/blkid_types.h: $(srcdir)/blkid_types.h.in $(top_builddir)/config.status
|
|
- @echo " CONFIG.STATUS $@"
|
|
- @cd $(top_builddir); \
|
|
+ cd $(top_builddir); \
|
|
CONFIG_FILES=$(my_dir)/blkid_types.h ./config.status
|
|
|
|
libblkid.3: $(DEP_SUBSTITUTE) $(srcdir)/libblkid.3.in
|
|
- @echo " SUBST $@"
|
|
- @$(SUBSTITUTE_UPTIME) $(srcdir)/libblkid.3.in libblkid.3
|
|
+ $(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..."
|
|
- @echo "#!/bin/sh" > test_probe
|
|
- @echo "SRCDIR=@srcdir@" >> test_probe
|
|
- @cat $(srcdir)/test_probe.in >> test_probe
|
|
- @chmod +x test_probe
|
|
+ cat $(srcdir)/test_probe.in >> test_probe
|
|
+ chmod +x test_probe
|
|
|
|
check:: all tst_cache tst_dev tst_devname tst_devno tst_getsize tst_probe \
|
|
tst_read tst_resolve tst_save tst_tag test_probe tst_types
|
|
@@ -138,33 +119,29 @@ check:: all tst_cache tst_dev tst_devnam
|
|
./tst_types
|
|
|
|
blkid.pc: $(srcdir)/blkid.pc.in $(top_builddir)/config.status
|
|
- @echo " CONFIG.STATUS $@"
|
|
- @cd $(top_builddir); CONFIG_FILES=lib/blkid/blkid.pc ./config.status
|
|
+ cd $(top_builddir); CONFIG_FILES=lib/blkid/blkid.pc ./config.status
|
|
|
|
installdirs::
|
|
- @echo " MKINSTALLDIRS $(libdir) $(includedir)/blkid"
|
|
- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
|
|
+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
|
|
$(DESTDIR)$(includedir)/blkid $(DESTDIR)$(libdir)/pkgconfig
|
|
|
|
install:: all installdirs
|
|
- @echo " INSTALL_DATA $(libdir)/libblkid.a"
|
|
- @$(INSTALL_DATA) libblkid.a $(DESTDIR)$(libdir)/libblkid.a
|
|
- @-$(RANLIB) $(DESTDIR)$(libdir)/libblkid.a
|
|
- @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libblkid.a
|
|
- @set -e; for i in $(HFILES); do \
|
|
+ $(INSTALL_DATA) libblkid.a $(DESTDIR)$(libdir)/libblkid.a
|
|
+ -$(RANLIB) $(DESTDIR)$(libdir)/libblkid.a
|
|
+ $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libblkid.a
|
|
+ set -e; for i in $(HFILES); do \
|
|
echo " INSTALL_DATA $(includedir)/blkid/$$i"; \
|
|
$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/blkid/$$i; \
|
|
done
|
|
- @set -e; for i in $(HFILES_IN); do \
|
|
+ set -e; for i in $(HFILES_IN); do \
|
|
echo " INSTALL_DATA $(includedir)/blkid/$$i"; \
|
|
$(INSTALL_DATA) $$i $(DESTDIR)$(includedir)/blkid/$$i; \
|
|
done
|
|
- @for i in $(SMANPAGES); do \
|
|
+ for i in $(SMANPAGES); do \
|
|
echo " INSTALL_DATA $(man3dir)/$$i"; \
|
|
$(INSTALL_DATA) $$i $(DESTDIR)$(man3dir)/$$i; \
|
|
done
|
|
- @echo " INSTALL_DATA $(libdir)/pkgconfig/blkid.pc"
|
|
- @$(INSTALL_DATA) blkid.pc $(DESTDIR)$(libdir)/pkgconfig/blkid.pc
|
|
+ $(INSTALL_DATA) blkid.pc $(DESTDIR)$(libdir)/pkgconfig/blkid.pc
|
|
|
|
uninstall::
|
|
$(RM) -f $(DESTDIR)$(libdir)/libblkid.a \
|
|
Index: lib/e2p/Makefile.in
|
|
===================================================================
|
|
--- lib/e2p/Makefile.in.orig
|
|
+++ lib/e2p/Makefile.in
|
|
@@ -53,41 +53,35 @@ 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 $<
|
|
|
|
e2p.pc: $(srcdir)/e2p.pc.in $(top_builddir)/config.status
|
|
- @echo " CONFIG.STATUS $@"
|
|
- @cd $(top_builddir); CONFIG_FILES=lib/e2p/e2p.pc ./config.status
|
|
+ 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)
|
|
|
|
check:: tst_ostype
|
|
./tst_ostype
|
|
|
|
installdirs::
|
|
- @echo " MKINSTALLDIRS $(libdir) $(includedir)/e2p"
|
|
- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
|
|
+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
|
|
$(DESTDIR)$(includedir)/e2p $(DESTDIR)$(libdir)/pkgconfig
|
|
|
|
install:: all installdirs
|
|
- @echo " INSTALL_DATA $(libdir)/libe2p.a"
|
|
- @$(INSTALL_DATA) libe2p.a $(DESTDIR)$(libdir)/libe2p.a
|
|
- @-$(RANLIB) $(DESTDIR)$(libdir)/libe2p.a
|
|
- @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libe2p.a
|
|
- @set -e; for i in $(HFILES); do \
|
|
+ $(INSTALL_DATA) libe2p.a $(DESTDIR)$(libdir)/libe2p.a
|
|
+ -$(RANLIB) $(DESTDIR)$(libdir)/libe2p.a
|
|
+ $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libe2p.a
|
|
+ set -e; for i in $(HFILES); do \
|
|
echo " INSTALL_DATA $(includedir)/e2p/$$i"; \
|
|
$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/e2p/$$i; \
|
|
done
|
|
- @echo " INSTALL_DATA $(libdir)/pkgconfig/e2p.pc"
|
|
- @$(INSTALL_DATA) e2p.pc $(DESTDIR)$(libdir)/pkgconfig/e2p.pc
|
|
+ $(INSTALL_DATA) e2p.pc $(DESTDIR)$(libdir)/pkgconfig/e2p.pc
|
|
|
|
uninstall::
|
|
$(RM) -f $(DESTDIR)$(libdir)/libe2p.a \
|
|
Index: lib/et/Makefile.in
|
|
===================================================================
|
|
--- lib/et/Makefile.in.orig
|
|
+++ lib/et/Makefile.in
|
|
@@ -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@
|
|
@@ -55,16 +54,14 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
|
|
@MAKEFILE_CHECKER@
|
|
|
|
compile_et: $(DEP_SUBSTITUTE) $(srcdir)/compile_et.sh.in
|
|
- @echo " SUBST $@"
|
|
- @$(SUBSTITUTE) $(srcdir)/compile_et.sh.in compile_et
|
|
- @$(CHMOD) +x compile_et
|
|
+ $(SUBSTITUTE) $(srcdir)/compile_et.sh.in compile_et
|
|
+ $(CHMOD) +x compile_et
|
|
|
|
com_err.ps : com_err.dvi
|
|
com_err.dvi: com_err.texinfo
|
|
|
|
com_err.pc: $(srcdir)/com_err.pc.in $(top_builddir)/config.status
|
|
- @echo " CONFIG.STATUS $@"
|
|
- @cd $(top_builddir); CONFIG_FILES=lib/et/com_err.pc ./config.status
|
|
+ cd $(top_builddir); CONFIG_FILES=lib/et/com_err.pc ./config.status
|
|
|
|
#libcom_err.o: $(LIBOBJS)
|
|
# $(LD) -r -s -o libcom_err.o $(LIBOBJS)
|
|
@@ -74,34 +71,28 @@ TAGS: $(SRCS)
|
|
$(TAGS) $(SRCS)
|
|
|
|
installdirs::
|
|
- @echo " MKINSTALLDIRS $(libdir) $(includedir)/et $(datadir)/et $(bindir) $(man1dir) $(man3dir)"
|
|
- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
|
|
+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
|
|
$(DESTDIR)$(includedir)/et $(DESTDIR)$(datadir)/et \
|
|
$(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) \
|
|
$(DESTDIR)$(man3dir) $(DESTDIR)$(libdir)/pkgconfig
|
|
|
|
install:: compile_et libcom_err.a $(HFILES) installdirs com_err.pc
|
|
- @echo " INSTALL_DATA $(libdir)/libcom_err.a"
|
|
- @$(INSTALL_DATA) libcom_err.a $(DESTDIR)$(libdir)/libcom_err.a
|
|
- @-$(RANLIB) $(DESTDIR)$(libdir)/libcom_err.a
|
|
- @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libcom_err.a
|
|
- @for i in $(HFILES); do \
|
|
+ $(INSTALL_DATA) libcom_err.a $(DESTDIR)$(libdir)/libcom_err.a
|
|
+ -$(RANLIB) $(DESTDIR)$(libdir)/libcom_err.a
|
|
+ $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libcom_err.a
|
|
+ for i in $(HFILES); do \
|
|
echo " INSTALL_DATA $(includedir)/et/$$i"; \
|
|
$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/et/$$i; \
|
|
done
|
|
- @for i in $(SHARE_FILES); do \
|
|
+ for i in $(SHARE_FILES); do \
|
|
echo " INSTALL_DATA $(datadir)/et/$$i"; \
|
|
$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(datadir)/et/$$i; \
|
|
done
|
|
- @echo " INSTALL_SCRIPT $(bindir)/compile_et"
|
|
- @$(INSTALL_SCRIPT) compile_et $(DESTDIR)$(bindir)/compile_et
|
|
- @echo " INSTALL_DATA $(man3dir)/com_err.3"
|
|
- @$(INSTALL_DATA) $(srcdir)/com_err.3 $(DESTDIR)$(man3dir)/com_err.3
|
|
- @echo " INSTALL_DATA $(man1dir)/compile_et.1"
|
|
- @$(INSTALL_DATA) $(srcdir)/compile_et.1 \
|
|
+ $(INSTALL_SCRIPT) compile_et $(DESTDIR)$(bindir)/compile_et
|
|
+ $(INSTALL_DATA) $(srcdir)/com_err.3 $(DESTDIR)$(man3dir)/com_err.3
|
|
+ $(INSTALL_DATA) $(srcdir)/compile_et.1 \
|
|
$(DESTDIR)$(man1dir)/compile_et.1
|
|
- @echo " INSTALL_DATA $(libdir)/pkgconfig/com_err.pc"
|
|
- @$(INSTALL_DATA) com_err.pc $(DESTDIR)$(libdir)/pkgconfig/com_err.pc
|
|
+ $(INSTALL_DATA) com_err.pc $(DESTDIR)$(libdir)/pkgconfig/com_err.pc
|
|
|
|
uninstall::
|
|
$(RM) -f $(DESTDIR)$(libdir)/libcom_err.a \
|
|
Index: lib/ext2fs/Makefile.in
|
|
===================================================================
|
|
--- lib/ext2fs/Makefile.in.orig
|
|
+++ lib/ext2fs/Makefile.in
|
|
@@ -164,86 +164,70 @@ 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 freefs.o \
|
|
read_bb_file.o write_bb_file.o badblocks.o
|
|
- @echo " LD $@"
|
|
- @$(CC) -o tst_badblocks tst_badblocks.o freefs.o \
|
|
+ $(CC) -o tst_badblocks tst_badblocks.o freefs.o \
|
|
read_bb_file.o write_bb_file.o badblocks.o \
|
|
inline.o bitops.o gen_bitmap.o $(LIBCOM_ERR)
|
|
|
|
tst_icount: icount.c initialize.o $(STATIC_LIBEXT2FS)
|
|
- @echo " LD $@"
|
|
- @$(CC) -o tst_icount $(srcdir)/icount.c initialize.o \
|
|
+ $(CC) -o tst_icount $(srcdir)/icount.c initialize.o \
|
|
-DDEBUG $(ALL_CFLAGS) \
|
|
$(STATIC_LIBEXT2FS) $(LIBCOM_ERR)
|
|
|
|
tst_iscan: tst_iscan.o inode.o badblocks.o test_io.o $(STATIC_LIBEXT2FS)
|
|
- @echo " LD $@"
|
|
- @$(CC) -o tst_iscan tst_iscan.o inode.o badblocks.o test_io.o \
|
|
+ $(CC) -o tst_iscan tst_iscan.o inode.o badblocks.o test_io.o \
|
|
$(STATIC_LIBEXT2FS) $(LIBCOM_ERR)
|
|
|
|
tst_getsize: tst_getsize.o getsize.o $(STATIC_LIBEXT2FS)
|
|
- @echo " LD $@"
|
|
- @$(CC) -o tst_getsize tst_getsize.o getsize.o $(STATIC_LIBEXT2FS) \
|
|
+ $(CC) -o tst_getsize tst_getsize.o 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 bitops.o $(STATIC_LIBEXT2FS)
|
|
- @echo " LD $@"
|
|
- @$(CC) -o tst_byteswap tst_byteswap.o bitops.o $(STATIC_LIBEXT2FS) \
|
|
+ $(CC) -o tst_byteswap tst_byteswap.o bitops.o $(STATIC_LIBEXT2FS) \
|
|
$(LIBCOM_ERR)
|
|
|
|
tst_bitops: tst_bitops.o inline.o $(STATIC_LIBEXT2FS)
|
|
- @echo " LD $@"
|
|
- @$(CC) -o tst_bitops tst_bitops.o inline.o $(ALL_CFLAGS) \
|
|
+ $(CC) -o tst_bitops tst_bitops.o inline.o $(ALL_CFLAGS) \
|
|
$(STATIC_LIBEXT2FS) $(LIBCOM_ERR)
|
|
|
|
tst_getsectsize: tst_getsectsize.o getsectsize.o $(STATIC_LIBEXT2FS)
|
|
- @echo " LD $@"
|
|
- @$(CC) -o tst_sectgetsize tst_getsectsize.o getsectsize.o \
|
|
+ $(CC) -o tst_sectgetsize tst_getsectsize.o 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
|
|
|
|
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 @SWAPFS_CMT@ tst_byteswap \
|
|
tst_types tst_icount tst_super_size
|
|
@@ -256,25 +240,22 @@ check:: tst_bitops tst_badblocks tst_isc
|
|
LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_super_size
|
|
|
|
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
|
|
- @-$(RANLIB) $(DESTDIR)$(libdir)/libext2fs.a
|
|
- @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libext2fs.a
|
|
- @for i in $(HFILES); do \
|
|
+ $(INSTALL_DATA) libext2fs.a $(DESTDIR)$(libdir)/libext2fs.a
|
|
+ -$(RANLIB) $(DESTDIR)$(libdir)/libext2fs.a
|
|
+ $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libext2fs.a
|
|
+ for i in $(HFILES); do \
|
|
echo " INSTALL_DATA $(includedir)/ext2fs/$$i"; \
|
|
$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/ext2fs/$$i; \
|
|
done
|
|
- @for i in $(HFILES_IN); do \
|
|
+ for i in $(HFILES_IN); do \
|
|
echo " INSTALL_DATA $(includedir)/ext2fs/$$i"; \
|
|
$(INSTALL_DATA) $$i $(DESTDIR)$(includedir)/ext2fs/$$i; \
|
|
done
|
|
- @echo " INSTALL_DATA $(libdir)/pkgconfig/ext2fs.pc"
|
|
- @$(INSTALL_DATA) ext2fs.pc $(DESTDIR)$(libdir)/pkgconfig/ext2fs.pc
|
|
+ $(INSTALL_DATA) ext2fs.pc $(DESTDIR)$(libdir)/pkgconfig/ext2fs.pc
|
|
|
|
uninstall::
|
|
$(RM) -f $(DESTDIR)$(libdir)/libext2fs.a \
|
|
Index: lib/ss/Makefile.in
|
|
===================================================================
|
|
--- lib/ss/Makefile.in.orig
|
|
+++ lib/ss/Makefile.in
|
|
@@ -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
|
|
|
|
@@ -98,12 +97,10 @@ 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
|
|
|
|
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.*
|
|
@@ -116,42 +113,34 @@ 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
|
|
|
|
install:: libss.a $(INSTALL_HFILES) installdirs ss_err.h mk_cmds ss.pc
|
|
- @echo " INSTALL_DATA $(DESTDIR)$(libdir)/libss.a"
|
|
- @$(INSTALL_DATA) libss.a $(DESTDIR)$(libdir)/libss.a
|
|
- @-$(RANLIB) $(DESTDIR)$(libdir)/libss.a
|
|
- @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libss.a
|
|
- @$(RM) -f $(DESTDIR)$(includedir)/ss/*
|
|
- @for i in $(INSTALL_HFILES); do \
|
|
+ $(INSTALL_DATA) libss.a $(DESTDIR)$(libdir)/libss.a
|
|
+ -$(RANLIB) $(DESTDIR)$(libdir)/libss.a
|
|
+ $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libss.a
|
|
+ $(RM) -f $(DESTDIR)$(includedir)/ss/*
|
|
+ for i in $(INSTALL_HFILES); do \
|
|
echo " INSTALL_DATA $(DESTDIR)$(includedir)/ss/$$i"; \
|
|
$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/ss/$$i; \
|
|
done
|
|
- @echo " INSTALL_DATA $(includedir)/ss/ss_err.h"
|
|
- @$(INSTALL_DATA) ss_err.h $(DESTDIR)$(includedir)/ss/ss_err.h
|
|
- @for i in $(SHARE_FILES); do \
|
|
+ $(INSTALL_DATA) ss_err.h $(DESTDIR)$(includedir)/ss/ss_err.h
|
|
+ for i in $(SHARE_FILES); do \
|
|
echo " INSTALL_DATA $(DESTDIR)$(datadir)/ss/$$i"; \
|
|
$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(datadir)/ss/$$i; \
|
|
done
|
|
- @echo " INSTALL $(bindir)/mk_cmds"
|
|
- @$(INSTALL) mk_cmds $(DESTDIR)$(bindir)/mk_cmds
|
|
- @echo " INSTALL_DATA $(man1dir)/mk_cmds.1"
|
|
- @$(INSTALL_DATA) $(srcdir)/mk_cmds.1 $(DESTDIR)$(man1dir)/mk_cmds.1
|
|
- @echo " INSTALL_DATA $(libdir)/pkgconfig/ss.pc"
|
|
- @$(INSTALL_DATA) ss.pc $(DESTDIR)$(libdir)/pkgconfig/ss.pc
|
|
+ $(INSTALL) mk_cmds $(DESTDIR)$(bindir)/mk_cmds
|
|
+ $(INSTALL_DATA) $(srcdir)/mk_cmds.1 $(DESTDIR)$(man1dir)/mk_cmds.1
|
|
+ $(INSTALL_DATA) ss.pc $(DESTDIR)$(libdir)/pkgconfig/ss.pc
|
|
|
|
uninstall::
|
|
$(RM) -f $(DESTDIR)$(libdir)/libss.a $(DESTDIR)$(bindir)/mk_cmds \
|
|
Index: lib/uuid/Makefile.in
|
|
===================================================================
|
|
--- lib/uuid/Makefile.in.orig
|
|
+++ lib/uuid/Makefile.in
|
|
@@ -64,12 +64,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
|
|
|
|
@@ -77,84 +76,65 @@ $(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) $(ALL_LDFLAGS) -DDEBUG -o uuid_time $(srcdir)/uuid_time.c \
|
|
+ $(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) -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 $@"
|
|
- @cd $(top_builddir); CONFIG_FILES=lib/uuid/uuid.pc ./config.status
|
|
+ cd $(top_builddir); CONFIG_FILES=lib/uuid/uuid.pc ./config.status
|
|
|
|
installdirs::
|
|
- @echo " MKINSTALLDIRS $(libdir) $(includedir)/uuid $(man3dir)"
|
|
- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
|
|
+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
|
|
$(DESTDIR)$(includedir)/uuid $(DESTDIR)$(man3dir) \
|
|
$(DESTDIR)$(libdir)/pkgconfig
|
|
|
|
install:: all installdirs
|
|
- @echo " INSTALL_DATA $(libdir)/libuuid.a"
|
|
- @$(INSTALL_DATA) libuuid.a $(DESTDIR)$(libdir)/libuuid.a
|
|
- @-$(RANLIB) $(DESTDIR)$(libdir)/libuuid.a
|
|
- @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libuuid.a
|
|
- @echo " INSTALL_DATA $(includedir)/uuid/uuid.h"
|
|
- @$(INSTALL_DATA) $(srcdir)/uuid.h $(DESTDIR)$(includedir)/uuid/uuid.h
|
|
- @for i in $(SMANPAGES); do \
|
|
+ $(INSTALL_DATA) libuuid.a $(DESTDIR)$(libdir)/libuuid.a
|
|
+ -$(RANLIB) $(DESTDIR)$(libdir)/libuuid.a
|
|
+ $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libuuid.a
|
|
+ $(INSTALL_DATA) $(srcdir)/uuid.h $(DESTDIR)$(includedir)/uuid/uuid.h
|
|
+ for i in $(SMANPAGES); do \
|
|
$(RM) -f $(DESTDIR)$(man3dir)/$$i.gz; \
|
|
echo " INSTALL_DATA $(man3dir)/$$i"; \
|
|
$(INSTALL_DATA) $$i $(DESTDIR)$(man3dir)/$$i; \
|
|
done
|
|
- @$(RM) -f $(DESTDIR)$(man3dir)/uuid_generate_random.3.gz \
|
|
+ $(RM) -f $(DESTDIR)$(man3dir)/uuid_generate_random.3.gz \
|
|
$(DESTDIR)$(man3dir)/uuid_generate_time.3.gz
|
|
- @echo " LINK $(man3dir)/uuid_generate_random.3"
|
|
- @$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_random.3
|
|
- @echo " LINK $(man3dir)/uuid_generate_time.3"
|
|
- @$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3
|
|
- @echo " INSTALL_DATA $(libdir)/pkgconfig/uuid.pc"
|
|
- @$(INSTALL_DATA) uuid.pc $(DESTDIR)$(libdir)/pkgconfig/uuid.pc
|
|
+ $(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_random.3
|
|
+ $(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3
|
|
+ $(INSTALL_DATA) uuid.pc $(DESTDIR)$(libdir)/pkgconfig/uuid.pc
|
|
|
|
uninstall::
|
|
$(RM) -f $(DESTDIR)$(libdir)/libuuid.a \
|
|
Index: Makefile.in
|
|
===================================================================
|
|
--- Makefile.in.orig
|
|
+++ Makefile.in
|
|
@@ -24,7 +24,7 @@ all:: subs
|
|
$(MAKE) docs
|
|
|
|
subs:
|
|
- @for i in $(SUBS) ; do if test -d `dirname $$i` ; then $(MAKE) $$i ; fi ; done
|
|
+ for i in $(SUBS) ; do if test -d `dirname $$i` ; then $(MAKE) $$i ; fi ; done
|
|
|
|
progs: subs all-progs-recursive
|
|
libs: subs all-libs-recursive
|
|
@@ -65,7 +65,7 @@ uninstall-libs: uninstall-libs-recursive
|
|
|
|
TAGS clean-recursive distclean-recursive depend-recursive check-recursive \
|
|
mostlyclean-recursive realclean-recursive:
|
|
- @for subdir in $(SUBDIRS); do \
|
|
+ for subdir in $(SUBDIRS); do \
|
|
if test -d $$subdir ; then \
|
|
target=`echo $@|$(SED) 's/-recursive//'`; \
|
|
echo making $$target in $$subdir; \
|
|
@@ -75,7 +75,7 @@ TAGS clean-recursive distclean-recursive
|
|
|
|
all-progs-recursive install-progs-recursive install-strip-progs-recursive \
|
|
uninstall-progs-recursive:
|
|
- @for subdir in $(PROG_SUBDIRS); do \
|
|
+ for subdir in $(PROG_SUBDIRS); do \
|
|
if test -d $$subdir ; then \
|
|
target=`echo $@|$(SED) 's/-progs-recursive//'`; \
|
|
echo making $$target in $$subdir; \
|
|
@@ -86,7 +86,7 @@ all-progs-recursive install-progs-recurs
|
|
all-libs-recursive install-libs-recursive install-strip-libs-recursive \
|
|
uninstall-libs-recursive install-shlibs-libs-recursive \
|
|
install-shlibs-strip-libs-recursive uninstall-shlibs-libs-recursive:
|
|
- @for subdir in $(LIB_SUBDIRS); do \
|
|
+ for subdir in $(LIB_SUBDIRS); do \
|
|
if test -d $$subdir ; then \
|
|
target=`echo $@|$(SED) 's/-libs-recursive//'`; \
|
|
echo making $$target in $$subdir; \
|
|
Index: misc/Makefile.in
|
|
===================================================================
|
|
--- misc/Makefile.in.orig
|
|
+++ misc/Makefile.in
|
|
@@ -67,174 +67,134 @@ 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 \
|
|
> 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)
|
|
|
|
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)
|
|
|
|
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)
|
|
|
|
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)
|
|
|
|
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
|
|
|
|
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
|
|
|
|
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)"
|
|
- @$(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \
|
|
+ $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \
|
|
$(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \
|
|
$(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) \
|
|
$(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \
|
|
Index: resize/Makefile.in
|
|
===================================================================
|
|
--- resize/Makefile.in.orig
|
|
+++ resize/Makefile.in
|
|
@@ -34,39 +34,33 @@ 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
|
|
- @for i in $(PROGS); do \
|
|
+ for i in $(PROGS); do \
|
|
echo " INSTALL $(root_sbindir)/$$i"; \
|
|
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \
|
|
done
|
|
- @for i in $(MANPAGES); do \
|
|
+ for i in $(MANPAGES); do \
|
|
for j in $(COMPRESS_EXT); do \
|
|
$(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \
|
|
done; \
|
|
@@ -75,7 +69,7 @@ install: $(PROGS) $(MANPAGES) installdir
|
|
done
|
|
|
|
install-strip: install
|
|
- @for i in $(PROGS); do \
|
|
+ for i in $(PROGS); do \
|
|
echo " STRIP $(root_sbindir)/$$i"; \
|
|
$(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \
|
|
done
|
|
@@ -93,7 +87,7 @@ test_extent.out: test_extent $(srcdir)/t
|
|
> test_extent.out
|
|
|
|
check:: test_extent.out
|
|
- @if cmp -s test_extent.out $(srcdir)/test_extent.in ; then \
|
|
+ if cmp -s test_extent.out $(srcdir)/test_extent.in ; then \
|
|
echo "Test succeeded." ; \
|
|
else \
|
|
echo "Test failed!" ; \
|
|
Index: tests/Makefile.in
|
|
===================================================================
|
|
--- tests/Makefile.in.orig
|
|
+++ tests/Makefile.in
|
|
@@ -14,22 +14,14 @@ INSTALL = @INSTALL@
|
|
all:: @DO_TEST_SUITE@
|
|
|
|
test_script: test_script.in Makefile
|
|
- @echo "Creating test_script..."
|
|
- @echo "#!/bin/sh" > test_script
|
|
-@HTREE_CMT@ @echo "HTREE=y" >> test_script
|
|
- @echo 'EGREP="@EGREP@"' >> test_script
|
|
- @echo "SRCDIR=@srcdir@" >> test_script
|
|
- @echo "DIFF_OPTS=@UNI_DIFF_OPTS@" >> test_script
|
|
- @cat $(srcdir)/test_script.in >> test_script
|
|
- @chmod +x test_script
|
|
+@HTREE_CMT@ cat $(srcdir)/test_script.in >> test_script
|
|
+ chmod +x test_script
|
|
|
|
check:: test_script
|
|
- @echo "Running e2fsprogs test suite..."
|
|
- @echo " "
|
|
- @./test_script
|
|
+ ./test_script
|
|
|
|
check-failed:
|
|
- @a=`/bin/ls *.failed 2> /dev/null | sed -e 's/.failed//'`; \
|
|
+ a=`/bin/ls *.failed 2> /dev/null | sed -e 's/.failed//'`; \
|
|
if test "$$a"x == x ; then \
|
|
echo "No failed tests" ; \
|
|
else \
|
|
@@ -40,27 +32,18 @@ check-failed:
|
|
TDIR=f_testnew
|
|
# Target which creates a new testcase to simplify adding new regression tests.
|
|
testnew:
|
|
- @echo "Creating a new e2fsck testcase in ${TDIR}"
|
|
- @mkdir -p ${TDIR}
|
|
+ mkdir -p ${TDIR}
|
|
dd if=/dev/zero of=${TDIR}/image bs=1k count=8k
|
|
mke2fs -j -F -N 256 ${TDIR}/image
|
|
- @echo "new test description" > ${TDIR}/name
|
|
- @echo; echo; echo "New test filesystem at ${TDIR}/image."
|
|
- @echo "Now, break the filesystem as appropriate, and run 'make testend'"
|
|
|
|
EXPECT1=${TDIR}/expect.1
|
|
EXPECT2=${TDIR}/expect.2
|
|
# Target which generates the expect files for the new testcase.
|
|
testend: test_script ${TDIR}/image
|
|
gzip -9 ${TDIR}/image
|
|
- @OUT1=${EXPECT1} OUT2=${EXPECT2} ./test_script ${TDIR}
|
|
- @echo; echo; echo "*** output from first e2fsck run (${EXPECT1}) ***"
|
|
- @cat ${EXPECT1}
|
|
- @echo "*** output from second e2fsck run (${EXPECT2}) ***"
|
|
- @cat ${EXPECT2}
|
|
- @echo "*** end of e2fsck output ***"
|
|
- @echo; echo "Hopefully e2fsck now fixes this problem properly."
|
|
- @echo "If all is well, edit ${TDIR}/name and rename ${TDIR}."
|
|
+ OUT1=${EXPECT1} OUT2=${EXPECT2} ./test_script ${TDIR}
|
|
+ cat ${EXPECT1}
|
|
+ cat ${EXPECT2}
|
|
|
|
clean::
|
|
$(RM) -f *~ *.log *.new *.failed *.ok test.img test_script
|
|
Index: tests/progs/Makefile.in
|
|
===================================================================
|
|
--- tests/progs/Makefile.in.orig
|
|
+++ tests/progs/Makefile.in
|
|
@@ -25,26 +25,21 @@ LIBS= $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR
|
|
DEPLIBS= $(LIBEXT2FS) $(LIBSS) $(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: util/Makefile.in
|
|
===================================================================
|
|
--- util/Makefile.in.orig
|
|
+++ util/Makefile.in
|
|
@@ -14,25 +14,21 @@ 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 $@"
|
|
- @cd $(top_builddir); CONFIG_FILES=util/gen-tarball ./config.status
|
|
- @chmod +x gen-tarball
|
|
+ cd $(top_builddir); CONFIG_FILES=util/gen-tarball ./config.status
|
|
+ chmod +x gen-tarball
|
|
|
|
tarballs: gen-tarball
|
|
sh gen-tarball debian
|