diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2004-11-30 10:52:27 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2004-11-30 10:52:27 -0500 |
| commit | 47204ff9830b17fc6317f48e88d2039f57a5d10a (patch) | |
| tree | 8d57bc9cd5f44e7e142d3bac9c4327b982e2f321 | |
| parent | 39dc1c45cb41ce37a56d364103bb852d0b62c835 (diff) | |
| download | e2fsprogs-47204ff9830b17fc6317f48e88d2039f57a5d10a.tar.gz | |
Use Linux-kernel-style makefile output to make it easier to
see errors/warnings.
38 files changed, 398 insertions, 189 deletions
@@ -1,3 +1,10 @@ +2004-11-30 Theodore Ts'o <tytso@mit.edu> + + * Makefile.in: Use Linux-kernel-style makefile output to make it + easier to see errors/warnings. + + * MCONFIG.in: Add definition for ARGEN + 2004-09-18 Theodore Ts'o <tytso@mit.edu> * configure.in: Add --disable-e2initrd-helper flag to control @@ -57,6 +57,7 @@ RANLIB = @RANLIB@ STRIP = @STRIP@ LD = $(PURE) @CC@ ARUPD = $(AR) r +ARGEN = $(AR) rc LDCONFIG = @LDCONFIG@ # diff --git a/Makefile.in b/Makefile.in index 7ec96f13..72e0b1b2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -24,22 +24,22 @@ 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 docs: - -test -d doc && cd doc && $(MAKE) libext2fs.info + -@test -d doc && cd doc && $(MAKE) libext2fs.info install-doc-libs: - -test -d doc && cd doc && $(MAKE) install-doc-libs + -@test -d doc && cd doc && $(MAKE) install-doc-libs uninstall-doc-libs: - -test -d doc && cd doc && $(MAKE) uninstall-doc-libs + -@test -d doc && cd doc && $(MAKE) uninstall-doc-libs clean-doc: - -test -d doc && cd doc && $(MAKE) clean + -@test -d doc && cd doc && $(MAKE) clean distclean-doc: -test -d doc && cd doc && $(MAKE) distclean @@ -57,7 +57,7 @@ uninstall-libs: uninstall-libs-recursive TAGS clean-recursive distclean-recursive depend-recursive check-recursive \ mostlyclean-recursive realclean-recursive install-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; \ @@ -66,7 +66,7 @@ TAGS clean-recursive distclean-recursive depend-recursive check-recursive \ done all-progs-recursive install-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; \ @@ -75,7 +75,7 @@ all-progs-recursive install-progs-recursive uninstall-progs-recursive: done all-libs-recursive install-libs-recursive uninstall-libs-recursive install-shlibs-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; \ @@ -95,15 +95,18 @@ realclean: realclean-recursive realclean-local depend:: depend-recursive lib/ext2fs/ext2_types.h: $(DEP_SUBSTITUTE) $(srcdir)/lib/ext2fs/ext2_types.h.in - $(SUBSTITUTE) $(srcdir)/lib/ext2fs/ext2_types.h.in \ + @echo " SUBST $@" + @$(SUBSTITUTE) $(srcdir)/lib/ext2fs/ext2_types.h.in \ > lib/ext2fs/ext2_types.h lib/blkid/blkid_types.h: $(DEP_SUBSTITUTE) $(srcdir)/lib/blkid/blkid_types.h.in - $(SUBSTITUTE) $(srcdir)/lib/blkid/blkid_types.h.in \ + @echo " SUBST $@" + @$(SUBSTITUTE) $(srcdir)/lib/blkid/blkid_types.h.in \ > lib/blkid/blkid_types.h lib/uuid/uuid_types.h: $(DEP_SUBSTITUTE) $(srcdir)/lib/uuid/uuid_types.h.in - $(SUBSTITUTE) $(srcdir)/lib/uuid/uuid_types.h.in \ + @echo " SUBST $@" + @$(SUBSTITUTE) $(srcdir)/lib/uuid/uuid_types.h.in \ > lib/uuid/uuid_types.h mostlyclean-local: diff --git a/debugfs/ChangeLog b/debugfs/ChangeLog index 3362bfd5..dc7dcc7d 100644 --- a/debugfs/ChangeLog +++ b/debugfs/ChangeLog @@ -1,3 +1,8 @@ +2004-11-30 Theodore Ts'o <tytso@mit.edu> + + * Makefile.in: Use Linux-kernel-style makefile output to make it + easier to see errors/warnings. + 2004-11-29 Theodore Ts'o <tytso@mit.edu> * debugfs.c (do_open_filesys): Fix obvious uninitialized variable diff --git a/debugfs/Makefile.in b/debugfs/Makefile.in index cb5b90d8..3e7ef77a 100644 --- a/debugfs/Makefile.in +++ b/debugfs/Makefile.in @@ -30,18 +30,22 @@ LIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(LIBCOM_ERR) $(LIBBLKID) \ DEPLIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(LIBCOM_ERR) $(LIBBLKID) $(DEPLIBUUID) .c.o: - $(CC) -c $(ALL_CFLAGS) $< -o $@ + @echo " CC $<" + @$(CC) -c $(ALL_CFLAGS) $< -o $@ all:: $(PROGS) $(MANPAGES) debugfs: $(DEBUG_OBJS) $(DEPLIBS) - $(CC) $(ALL_LDFLAGS) -o debugfs $(DEBUG_OBJS) $(LIBS) + @echo " LD $@" + @$(CC) $(ALL_LDFLAGS) -o debugfs $(DEBUG_OBJS) $(LIBS) debug_cmds.c debug_cmds.h: debug_cmds.ct - $(MK_CMDS) $(srcdir)/debug_cmds.ct + @echo " MK_CMDS $@" + @$(MK_CMDS) $(srcdir)/debug_cmds.ct debugfs.8: $(DEP_SUBSTITUTE) $(srcdir)/debugfs.8.in - $(SUBSTITUTE_UPTIME) $(srcdir)/debugfs.8.in debugfs.8 + @echo " SUBST $@" + @$(SUBSTITUTE_UPTIME) $(srcdir)/debugfs.8.in debugfs.8 installdirs: $(top_srcdir)/mkinstalldirs $(DESTDIR)$(root_sbindir) \ diff --git a/doc/ChangeLog b/doc/ChangeLog index d75743a8..5693b4f4 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,8 @@ +2004-11-30 Theodore Ts'o <tytso@mit.edu> + + * Makefile.in: Use Linux-kernel-style makefile output to make it + easier to see errors/warnings. + 2004-02-28 Theodore Ts'o <tytso@mit.edu> * Release of E2fsprogs 1.35 diff --git a/doc/Makefile.in b/doc/Makefile.in index f3f11f2e..b7f73b2d 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -30,10 +30,12 @@ uninstall-doc-libs: $(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info* libext2fs.info: $(srcdir)/libext2fs.texinfo - -$(INFO) $(srcdir)/libext2fs.texinfo + @echo " MAKEINFO $<" + -@$(INFO) $(srcdir)/libext2fs.texinfo libext2fs.dvi: $(srcdir)/libext2fs.texinfo - -$(DVI) $(srcdir)/libext2fs.texinfo + @echo " TEXI2DVI $<" + -@$(DVI) $(srcdir)/libext2fs.texinfo .PHONY: distclean distclean:: clean diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog index c8518af5..9d74ecdd 100644 --- a/e2fsck/ChangeLog +++ b/e2fsck/ChangeLog @@ -1,3 +1,8 @@ +2004-11-30 Theodore Ts'o <tytso@mit.edu> + + * Makefile.in: Use Linux-kernel-style makefile output to make it + easier to see errors/warnings. + 2004-10-04 Richard Mortimer <richm@oldelvet.org.uk> * journal.c (e2fsck_check_ext3_journal): Attempt recovery of the diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in index d91d5616..1da3aa7a 100644 --- a/e2fsck/Makefile.in +++ b/e2fsck/Makefile.in @@ -30,8 +30,9 @@ PROFILED_DEPLIBS= $(PROFILED_LIBEXT2FS) $(PROFILED_LIBCOM_ERR) \ $(PROFILED_LIBBLKID) $(DEPPROFILED_LIBUUID) .c.o: - $(CC) -c $(ALL_CFLAGS) $< -o $@ -@PROFILE_CMT@ $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $< + @echo " CC $<" + @$(CC) -c $(ALL_CFLAGS) $< -o $@ +@PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $< # # Flags for using Checker @@ -103,41 +104,52 @@ all:: profiled $(PROGS) e2fsck.static e2fsck.shared $(MANPAGES) @PROFILE_CMT@all:: e2fsck.profiled e2fsck: e2fsck.@E2FSCK_TYPE@ - $(CP) e2fsck.@E2FSCK_TYPE@ e2fsck + @echo " CP $@" + @$(CP) e2fsck.@E2FSCK_TYPE@ e2fsck e2fsck.static: $(OBJS) $(STATIC_DEPLIBS) - $(LD) $(ALL_LDFLAGS) $(LDFLAG_STATIC) -o e2fsck.static $(OBJS) \ + @echo " LD $@" + @$(LD) $(ALL_LDFLAGS) $(LDFLAG_STATIC) -o e2fsck.static $(OBJS) \ $(STATIC_LIBS) e2fsck.shared: $(OBJS) $(DEPLIBS) - $(LD) $(ALL_LDFLAGS) -o e2fsck.shared $(OBJS) $(LIBS) + @echo " LD $@" + @$(LD) $(ALL_LDFLAGS) -o e2fsck.shared $(OBJS) $(LIBS) e2fsck.profiled: $(PROFILED_OBJS) $(PROFILED_DEPLIBS) - $(LD) $(ALL_LDFLAGS) -g -pg -o e2fsck.profiled $(PROFILED_OBJS) \ + @echo " LD $@" + @$(LD) $(ALL_LDFLAGS) -g -pg -o e2fsck.profiled $(PROFILED_OBJS) \ $(PROFILED_LIBS) tst_refcount: ea_refcount.c - $(CC) -o tst_refcount $(srcdir)/ea_refcount.c \ + @echo " LD $@" + @$(CC) -o tst_refcount $(srcdir)/ea_refcount.c \ $(ALL_CFLAGS) -DTEST_PROGRAM -lcom_err tst_region: region.c - $(CC) -o tst_region $(srcdir)/region.c \ + @echo " LD $@" + @$(CC) -o tst_region $(srcdir)/region.c \ $(ALL_CFLAGS) -DTEST_PROGRAM -lcom_err extend: extend.o - $(LD) $(ALL_LDFLAGS) -o extend extend.o $(CHECKLIB) + @echo " LD $@" + @$(LD) $(ALL_LDFLAGS) -o extend extend.o $(CHECKLIB) flushb: flushb.o - $(LD) $(ALL_LDFLAGS) -o flushb flushb.o $(CHECKLIB) + @echo " LD $@" + @$(LD) $(ALL_LDFLAGS) -o flushb flushb.o $(CHECKLIB) iscan: iscan.o util.o ehandler.o $(DEPLIBS) - $(LD) $(ALL_LDFLAGS) -o iscan iscan.o util.o ehandler.o $(LIBS) + @echo " LD $@" + @$(LD) $(ALL_LDFLAGS) -o iscan iscan.o util.o ehandler.o $(LIBS) profiled: - mkdir profiled + @echo " MKDIR $@" + @mkdir profiled e2fsck.8: $(DEP_SUBSTITUTE) $(srcdir)/e2fsck.8.in - $(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.8.in e2fsck.8 + @echo " SUBST $@" + @$(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.8.in e2fsck.8 installdirs: $(top_srcdir)/mkinstalldirs $(DESTDIR)$(root_sbindir) \ diff --git a/lib/ChangeLog b/lib/ChangeLog index c9fa386d..2935cece 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,10 @@ +2004-11-30 Theodore Ts'o <tytso@mit.edu> + + * Makefile.elf-lib, Makefile.library, Makefile.profile, + Makefile.solaris, Makefile.darwin-lib, Makefile.checker: + Use Linux-kernel-style makefile output to make it easier + to see errors/warnings. + 2004-09-17 Theodore Ts'o <tytso@mit.edu> * Makefile.dll-lib (jump): Remove XSI:isms for greater portability. diff --git a/lib/Makefile.checker b/lib/Makefile.checker index 6064494a..372c0889 100644 --- a/lib/Makefile.checker +++ b/lib/Makefile.checker @@ -3,14 +3,16 @@ all:: checker $(LIBRARY)_chk.a subdirs:: checker checker: - mkdir checker + @echo " MKDIR $@" + @mkdir checker clean:: $(RM) -rf checker $(LIBRARY)_chk.a: $(OBJS) + @echo " GEN_CHECKER_LIB $@" @(test -r $@ && $(RM) -f $@.bak && $(MV) $@ $@.bak) - (cd checker; $(ARUPD) $@ $(OBJS)) - -$(RANLIB) $@ - $(RM) -f ../$@ - $(LN) $@ ../$@ + (cd checker; $(ARGEN) $@ $(OBJS)) + -@$(RANLIB) $@ + @$(RM) -f ../$@ + @$(LN) $@ ../$@ diff --git a/lib/Makefile.darwin-lib b/lib/Makefile.darwin-lib index 84f05b8d..2acda4e6 100644 --- a/lib/Makefile.darwin-lib +++ b/lib/Makefile.darwin-lib @@ -23,12 +23,13 @@ BSDLIB_PIC_FLAG = -fPIC image: $(BSD_LIB) $(BSD_LIB): $(OBJS) - (cd pic; $(CC) -dynamiclib -compatibility_version 1.0 -current_version $(BSDLIB_VERSION) \ + @echo " GEN_BSD_SOLIB $(BSD_LIB)" + @(cd pic; $(CC) -dynamiclib -compatibility_version 1.0 -current_version $(BSDLIB_VERSION) \ -flat_namespace -undefined warning -o $(BSD_LIB) $(OBJS)) - $(MV) pic/$(BSD_LIB) . - $(RM) -f ../$(BSD_LIB) - $(LN) $(BSD_LIB) ../$(BSD_LIB) - $(LN) ../$(BSD_LIB) ../$(BSDLIB_IMAGE).dylib + @$(MV) pic/$(BSD_LIB) . + @$(RM) -f ../$(BSD_LIB) + @$(LN) $(BSD_LIB) ../$(BSD_LIB) + @$(LN) ../$(BSD_LIB) ../$(BSDLIB_IMAGE).dylib install-shlibs install:: $(BSD_LIB) $(INSTALL_PROGRAM) $(BSD_LIB) \ diff --git a/lib/Makefile.elf-lib b/lib/Makefile.elf-lib index 864a9c40..7b9036cd 100644 --- a/lib/Makefile.elf-lib +++ b/lib/Makefile.elf-lib @@ -16,7 +16,8 @@ all:: elfshared image subdirs:: elfshared elfshared: - mkdir elfshared + @echo " MKDIR elfshared" + @mkdir elfshared ELF_LIB = $(ELF_IMAGE).so.$(ELF_VERSION) ELF_SONAME = $(ELF_IMAGE).so.$(ELF_SO_VERSION) @@ -24,13 +25,14 @@ ELF_SONAME = $(ELF_IMAGE).so.$(ELF_SO_VERSION) image: $(ELF_LIB) $(ELF_LIB): $(OBJS) - (cd elfshared; $(CC) --shared -o $(ELF_LIB) -Wl,-soname,$(ELF_SONAME) \ - $(OBJS) $(ELF_OTHER_LIBS)) - $(MV) elfshared/$(ELF_LIB) . - $(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME) - $(LN) $(ELF_LIB) ../$(ELF_LIB) - $(LN) ../$(ELF_LIB) ../$(ELF_IMAGE).so - $(LN) ../$(ELF_LIB) ../$(ELF_SONAME) + @echo " GEN_ELF_SOLIB $(ELF_LIB)" + @(cd elfshared; $(CC) --shared -o $(ELF_LIB) \ + -Wl,-soname,$(ELF_SONAME) $(OBJS) $(ELF_OTHER_LIBS)) + @$(MV) elfshared/$(ELF_LIB) . + @$(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME) + @$(LN) $(ELF_LIB) ../$(ELF_LIB) + @$(LN) ../$(ELF_LIB) ../$(ELF_IMAGE).so + @$(LN) ../$(ELF_LIB) ../$(ELF_SONAME) installdirs-elf-lib:: $(top_srcdir)/mkinstalldirs $(DESTDIR)$(ELF_INSTALL_DIR) \ diff --git a/lib/Makefile.library b/lib/Makefile.library index 2ea95c11..585e1466 100644 --- a/lib/Makefile.library +++ b/lib/Makefile.library @@ -5,9 +5,10 @@ install-shlibs:: subdirs:: $(LIBRARY).a: $(OBJS) - (if test -r $@; then $(RM) -f $@.bak && $(MV) $@ $@.bak; fi) - $(ARUPD) $@ $(OBJS) - -$(RANLIB) $@ - $(RM) -f ../$@ - $(LN) $@ ../$@ + @echo " GEN_LIB $@" + @(if test -r $@; then $(RM) -f $@.bak && $(MV) $@ $@.bak; fi) + @$(ARGEN) $@ $(OBJS) + -@$(RANLIB) $@ + @$(RM) -f ../$@ + @$(LN) $@ ../$@ diff --git a/lib/Makefile.profile b/lib/Makefile.profile index 674cac76..7c44e615 100644 --- a/lib/Makefile.profile +++ b/lib/Makefile.profile @@ -3,18 +3,20 @@ all:: profiled $(LIBRARY)_p.a subdirs:: profiled profiled: - mkdir profiled + @echo " MKDIR $@" + @mkdir profiled clean:: $(RM) -rf profiled $(RM) -f $(LIBRARY)_p.a ../$(LIBRARY)_p.a $(LIBRARY)_p.a: $(OBJS) - (if test -r $@; then $(RM) -f $@.bak && $(MV) $@ $@.bak; fi) - (cd profiled; $(ARUPD) ../$@ $(OBJS)) - -$(RANLIB) $@ - $(RM) -f ../$@ - $(LN) $@ ../$@ + @echo " GEN_PROFILED_LIB $(ELF_LIB)" + @(if test -r $@; then $(RM) -f $@.bak && $(MV) $@ $@.bak; fi) + @(cd profiled; $(ARUPD) ../$@ $(OBJS)) + -@$(RANLIB) $@ + @$(RM) -f ../$@ + @$(LN) $@ ../$@ install:: $(LIBRARY)_p.a installdirs $(INSTALL_DATA) $(LIBRARY)_p.a $(DESTDIR)$(libdir)/$(LIBRARY)_p.a diff --git a/lib/Makefile.solaris-lib b/lib/Makefile.solaris-lib index 6b0db124..8e683a28 100644 --- a/lib/Makefile.solaris-lib +++ b/lib/Makefile.solaris-lib @@ -24,13 +24,14 @@ ELF_SONAME = $(ELF_IMAGE).so.$(ELF_SO_VERSION) image: $(ELF_LIB) $(ELF_LIB): $(OBJS) - (cd elfshared; $(CC) --shared -o $(ELF_LIB) -Wl,-h,$(ELF_SONAME) \ + @echo " GEN_ELF_SOLIB $(ELF_LIB)" + @(cd elfshared; $(CC) --shared -o $(ELF_LIB) -Wl,-h,$(ELF_SONAME) \ $(OBJS) $(ELF_OTHER_LIBS)) - $(MV) elfshared/$(ELF_LIB) . - $(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME) - $(LN) $(ELF_LIB) ../$(ELF_LIB) - $(LN) ../$(ELF_LIB) ../$(ELF_IMAGE).so - $(LN) ../$(ELF_LIB) ../$(ELF_SONAME) + @$(MV) elfshared/$(ELF_LIB) . + @$(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME) + @$(LN) $(ELF_LIB) ../$(ELF_LIB) + @$(LN) ../$(ELF_LIB) ../$(ELF_IMAGE).so + @$(LN) ../$(ELF_LIB) ../$(ELF_SONAME) installdirs-elf-lib:: $(top_srcdir)/mkinstalldirs $(DESTDIR)$(ELF_INSTALL_DIR) \ diff --git a/lib/blkid/ChangeLog b/lib/blkid/ChangeLog index ba74f55b..ded2abb9 100644 --- a/lib/blkid/ChangeLog +++ b/lib/blkid/ChangeLog @@ -1,3 +1,8 @@ +2004-11-30 Theodore Ts'o <tytso@mit.edu> + + * Makefile.in: Use Linux-kernel-style makefile output to make it + easier to see errors/warnings. + 2004-11-19 Theodore Ts'o <tytso@mit.edu> * probe.c (probe_ocfs): Fix bug where the wrong size for "ocfs1" diff --git a/lib/blkid/Makefile.in b/lib/blkid/Makefile.in index f548ff38..a7f6f8ef 100644 --- a/lib/blkid/Makefile.in +++ b/lib/blkid/Makefile.in @@ -53,53 +53,68 @@ LIBS_BLKID= $(STATIC_LIBBLKID) $(STATIC_LIBUUID) DEPLIBS_BLKID= $(DEPSTATIC_LIBBLKID) $(DEPSTATIC_LIBUUID) .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 $< -@BSDLIB_CMT@ $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $< + @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 $< all:: $(SMANPAGES) $(top_builddir)/lib/blkid/blkid_types.h: $(srcdir)/blkid_types.h.in $(top_builddir)/config.status - cd $(top_builddir); CONFIG_FILES=$(my_dir)/blkid_types.h ./config.status + @echo " CONFIG.STATUS $<" + @cd $(top_builddir); \ + CONFIG_FILES=$(my_dir)/blkid_types.h ./config.status libblkid.3: $(DEP_SUBSTITUTE) $(srcdir)/libblkid.3.in - $(SUBSTITUTE_UPTIME) $(srcdir)/libblkid.3.in libblkid.3 + @echo " CC $<" + @$(SUBSTITUTE_UPTIME) $(srcdir)/libblkid.3.in libblkid.3 tst_cache: $(srcdir)/cache.c $(DEPLIBS_BLKID) - $(CC) -o tst_cache -DTEST_PROGRAM $(srcdir)/cache.c $(LIBS_BLKID) $(ALL_CFLAGS) + @echo " LD $<" + @$(CC) -o tst_cache -DTEST_PROGRAM $(srcdir)/cache.c $(LIBS_BLKID) $(ALL_CFLAGS) tst_dev: $(srcdir)/dev.c $(DEPLIBS_BLKID) - $(CC) -o tst_dev -DTEST_PROGRAM $(srcdir)/dev.c $(LIBS_BLKID) $(ALL_CFLAGS) + @echo " LD $<" + @$(CC) -o tst_dev -DTEST_PROGRAM $(srcdir)/dev.c $(LIBS_BLKID) $(ALL_CFLAGS) tst_devname: $(srcdir)/devname.c $(DEPLIBS_BLKID) - $(CC) -o tst_devname -DTEST_PROGRAM $(srcdir)/devname.c $(LIBS_BLKID) $(ALL_CFLAGS) + @echo " LD $<" + @$(CC) -o tst_devname -DTEST_PROGRAM $(srcdir)/devname.c $(LIBS_BLKID) $(ALL_CFLAGS) tst_devno: $(srcdir)/devno.c $(DEPLIBS_BLKID) - $(CC) -o tst_devno -DTEST_PROGRAM $(srcdir)/devno.c $(LIBS_BLKID) $(ALL_CFLAGS) + @echo " LD $<" + @$(CC) -o tst_devno -DTEST_PROGRAM $(srcdir)/devno.c $(LIBS_BLKID) $(ALL_CFLAGS) tst_getsize: $(srcdir)/getsize.c $(DEPLIBS_BLKID) - $(CC) -o tst_getsize -DTEST_PROGRAM $(srcdir)/getsize.c $(LIBS_BLKID) $(ALL_CFLAGS) + @echo " LD $<" + @$(CC) -o tst_getsize -DTEST_PROGRAM $(srcdir)/getsize.c $(LIBS_BLKID) $(ALL_CFLAGS) tst_probe: $(srcdir)/probe.c $(DEPLIBS_BLKID) - $(CC) -o tst_probe -DTEST_PROGRAM $(srcdir)/probe.c $(LIBS_BLKID) $(ALL_CFLAGS) + @echo " LD $<" + @$(CC) -o tst_probe -DTEST_PROGRAM $(srcdir)/probe.c $(LIBS_BLKID) $(ALL_CFLAGS) tst_read: $(srcdir)/read.c $(DEPLIBS_BLKID) - $(CC) -o tst_read -DTEST_PROGRAM $(srcdir)/read.c $(LIBS_BLKID) $(ALL_CFLAGS) + @echo " LD $<" + @$(CC) -o tst_read -DTEST_PROGRAM $(srcdir)/read.c $(LIBS_BLKID) $(ALL_CFLAGS) tst_resolve: $(srcdir)/resolve.c $(DEPLIBS_BLKID) - $(CC) -o tst_resolve -DTEST_PROGRAM $(srcdir)/resolve.c $(LIBS_BLKID) $(ALL_CFLAGS) + @echo " LD $<" + @$(CC) -o tst_resolve -DTEST_PROGRAM $(srcdir)/resolve.c $(LIBS_BLKID) $(ALL_CFLAGS) tst_save: $(srcdir)/save.c $(DEPLIBS_BLKID) - $(CC) -o tst_save -DTEST_PROGRAM $(srcdir)/save.c $(LIBS_BLKID) $(ALL_CFLAGS) + @echo " LD $<" + @$(CC) -o tst_save -DTEST_PROGRAM $(srcdir)/save.c $(LIBS_BLKID) $(ALL_CFLAGS) ../../misc/blkid.o: $(top_srcdir)/misc/blkid.c blkid.h - $(CC) $(ALL_CFLAGS) -c $(top_srcdir)/misc/blkid.c \ + @echo " CC $@" + @$(CC) $(ALL_CFLAGS) -c $(top_srcdir)/misc/blkid.c \ -o ../../misc/blkid.o blkid: ../../misc/blkid.o libblkid.a $(DEPLIBUUID) - $(CC) -o blkid ../../misc/blkid.o libblkid.a $(LIBUUID) + @echo " LD $<" + @$(CC) -o blkid ../../misc/blkid.o libblkid.a $(LIBUUID) check:: all tst_cache tst_devname tst_devno tst_getsize tst_probe \ tst_read tst_resolve tst_save diff --git a/lib/e2p/ChangeLog b/lib/e2p/ChangeLog index d920ff64..2a67f659 100644 --- a/lib/e2p/ChangeLog +++ b/lib/e2p/ChangeLog @@ -1,3 +1,8 @@ +2004-11-30 Theodore Ts'o <tytso@mit.edu> + + * Makefile.in: Use Linux-kernel-style makefile output to make it + easier to see errors/warnings. + 2004-11-29 Theodore Ts'o <tytso@mit.edu> * feature.c: Add support for the extents filesystem feature. diff --git a/lib/e2p/Makefile.in b/lib/e2p/Makefile.in index 63010f3e..6ba03710 100644 --- a/lib/e2p/Makefile.in +++ b/lib/e2p/Makefile.in @@ -52,11 +52,12 @@ BSDLIB_INSTALL_DIR = $(root_libdir) @MAKEFILE_CHECKER@ .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 $< -@BSDLIB_CMT@ $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $< + @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 $< installdirs:: $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir) \ diff --git a/lib/et/ChangeLog b/lib/et/ChangeLog index 24c854e8..6429fb71 100644 --- a/lib/et/ChangeLog +++ b/lib/et/ChangeLog @@ -1,3 +1,8 @@ +2004-11-30 Theodore Ts'o <tytso@mit.edu> + + * Makefile.in: Use Linux-kernel-style makefile output to make it + easier to see errors/warnings. + 2004-09-17 Theodore Ts'o <tytso@mit.edu> * compile_et.sh.in: Remove XSI:isms for greater portability. diff --git a/lib/et/Makefile.in b/lib/et/Makefile.in index 811d74b3..dda79804 100644 --- a/lib/et/Makefile.in +++ b/lib/et/Makefile.in @@ -41,11 +41,12 @@ BSDLIB_INSTALL_DIR = $(root_libdir) # what to build... # .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 $< -@BSDLIB_CMT@ $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $< + @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 $< @MAKEFILE_LIBRARY@ @MAKEFILE_ELF@ @@ -54,8 +55,9 @@ BSDLIB_INSTALL_DIR = $(root_libdir) @MAKEFILE_CHECKER@ compile_et: $(DEP_SUBSTITUTE) $(srcdir)/compile_et.sh.in - $(SUBSTITUTE) $(srcdir)/compile_et.sh.in compile_et - $(CHMOD) +x compile_et + @echo " SUBST $@" + @$(SUBSTITUTE) $(srcdir)/compile_et.sh.in compile_et + @$(CHMOD) +x compile_et com_err.ps : com_err.dvi com_err.dvi: com_err.texinfo diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog index 7ca7cf15..5a201d4d 100644 --- a/lib/ext2fs/ChangeLog +++ b/lib/ext2fs/ChangeLog @@ -1,3 +1,8 @@ +2004-11-30 Theodore Ts'o <tytso@mit.edu> + + * Makefile.in: Use Linux-kernel-style makefile output to make it + easier to see errors/warnings. + 2004-11-29 Theodore Ts'o <tytso@mit.edu> * ext2_fs.h (EXT2_EXTENTS_FL, EXT3_FEATURE_INCOMPAT_EXTENTS, diff --git a/lib/ext2fs/Makefile.in b/lib/ext2fs/Makefile.in index 09e0aa8e..5ebcd6cf 100644 --- a/lib/ext2fs/Makefile.in +++ b/lib/ext2fs/Makefile.in @@ -153,53 +153,64 @@ BSDLIB_INSTALL_DIR = $(root_libdir) @MAKEFILE_CHECKER@ .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 $< -@BSDLIB_CMT@ $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $< + @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 $< COMPILE_ET=../et/compile_et --build-tree DISTFILES= Makefile *.c *.h image ext2_err.et: $(DEP_SUBSTITUTE) $(srcdir)/ext2_err.et.in - $(SUBSTITUTE) $(srcdir)/ext2_err.et.in ext2_err.et + @echo " SUBST $@" + @$(SUBSTITUTE) $(srcdir)/ext2_err.et.in ext2_err.et ext2_err.c ext2_err.h: ext2_err.et - $(COMPILE_ET) ext2_err.et + @echo " COMPILE_ET $<" + @$(COMPILE_ET) ext2_err.et tst_badblocks: tst_badblocks.o freefs.o \ read_bb_file.o write_bb_file.o badblocks.o - $(CC) -o tst_badblocks tst_badblocks.o freefs.o \ + @echo " LD $<" + @$(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_iscan: tst_iscan.o inode.o badblocks.o test_io.o $(STATIC_LIBEXT2FS) - $(CC) -o tst_iscan tst_iscan.o inode.o badblocks.o test_io.o \ + @echo " LD $<" + @$(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) - $(CC) -o tst_getsize tst_getsize.o getsize.o $(STATIC_LIBEXT2FS) \ + @echo " LD $<" + @$(CC) -o tst_getsize tst_getsize.o getsize.o $(STATIC_LIBEXT2FS) \ $(LIBCOM_ERR) tst_ismounted: $(srcdir)/ismounted.c $(STATIC_LIBEXT2FS) - $(CC) -o tst_ismounted $(srcdir)/ismounted.c -DDEBUG $(ALL_CFLAGS) $(LIBCOM_ERR) + @echo " LD $<" + @$(CC) -o tst_ismounted $(srcdir)/ismounted.c -DDEBUG $(ALL_CFLAGS) $(LIBCOM_ERR) tst_byteswap: tst_byteswap.o bitops.o $(STATIC_LIBEXT2FS) - $(CC) -o tst_byteswap tst_byteswap.o bitops.o $(STATIC_LIBEXT2FS) \ + @echo " LD $<" + @$(CC) -o tst_byteswap tst_byteswap.o bitops.o $(STATIC_LIBEXT2FS) \ $(LIBCOM_ERR) tst_bitops: tst_bitops.o inline.o $(STATIC_LIBEXT2FS) - $(CC) -o tst_bitops tst_bitops.o inline.o \ + @echo " LD $<" + @$(CC) -o tst_bitops tst_bitops.o inline.o \ $(STATIC_LIBEXT2FS) $(LIBCOM_ERR) tst_getsectsize: tst_getsectsize.o getsectsize.o $(STATIC_LIBEXT2FS) - $(CC) -o tst_sectgetsize tst_getsectsize.o getsectsize.o \ + @echo " LD $<" + @$(CC) -o tst_sectgetsize tst_getsectsize.o getsectsize.o \ -DDEBUG $(STATIC_LIBEXT2FS) $(LIBCOM_ERR) mkjournal: mkjournal.c $(STATIC_LIBEXT2FS) - $(CC) -o mkjournal $(srcdir)/mkjournal.c -DDEBUG $(STATIC_LIBEXT2FS) $(LIBCOM_ERR) $(ALL_CFLAGS) + @echo " LD $<" + @$(CC) -o mkjournal $(srcdir)/mkjournal.c -DDEBUG $(STATIC_LIBEXT2FS) $(LIBCOM_ERR) $(ALL_CFLAGS) check:: tst_badblocks tst_iscan @SWAPFS_CMT@ tst_byteswap LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_badblocks diff --git a/lib/ss/ChangeLog b/lib/ss/ChangeLog index 426bee23..a2a61f58 100644 --- a/lib/ss/ChangeLog +++ b/lib/ss/ChangeLog @@ -1,3 +1,8 @@ +2004-11-30 Theodore Ts'o <tytso@mit.edu> + + * Makefile.in: Use Linux-kernel-style makefile output to make it + easier to see errors/warnings. + 2004-09-17 Theodore Ts'o <tytso@mit.edu> * mk_cmds.sh.in: Remove XSI:isms for greater portability. diff --git a/lib/ss/Makefile.in b/lib/ss/Makefile.in index e3fe26ed..071419e4 100644 --- a/lib/ss/Makefile.in +++ b/lib/ss/Makefile.in @@ -37,11 +37,12 @@ MK_CMDS=_SS_DIR_OVERRIDE=. ./mk_cmds XTRA_CFLAGS= -I$(srcdir)/../et .c.o: - $(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 $< + @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 $< # for the library @@ -97,10 +98,12 @@ FILES= $(SRCS) $(MKCMDSFILES) $(HFILES) \ all:: libss.a # libss_p.a lint std_rqs.c: std_rqs.ct mk_cmds - DIR=$(srcdir) $(MK_CMDS) $(srcdir)/std_rqs.ct + @echo " MK_CMDS $@" + @DIR=$(srcdir) $(MK_CMDS) $(srcdir)/std_rqs.ct ss_err.c ss_err.h: ss_err.et - $(COMPILE_ET) $(srcdir)/ss_err.et + @echo " COMPILE_ET $<" + @$(COMPILE_ET) $(srcdir)/ss_err.et ct.tab.c ct.tab.h: ct.y $(RM) -f ct.tab.* y.* @@ -113,8 +116,9 @@ ct.tab.c ct.tab.h: ct.y # $(CHMOD) -x $@ mk_cmds: $(DEP_SUBSTITUTE) $(srcdir)/mk_cmds.sh.in - $(SUBSTITUTE) $(srcdir)/mk_cmds.sh.in mk_cmds - $(CHMOD) +x mk_cmds + @echo " SUBST $@" + @$(SUBSTITUTE) $(srcdir)/mk_cmds.sh.in mk_cmds + @$(CHMOD) +x mk_cmds installdirs:: $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir) \ diff --git a/lib/uuid/ChangeLog b/lib/uuid/ChangeLog index 21b5319a..783bc48e 100644 --- a/lib/uuid/ChangeLog +++ b/lib/uuid/ChangeLog @@ -1,3 +1,8 @@ +2004-11-30 Theodore Ts'o <tytso@mit.edu> + + * Makefile.in: Use Linux-kernel-style makefile output to make it + easier to see errors/warnings. + 2004-09-17 Theodore Ts'o <tytso@mit.edu> * gen_uuid.c (get_node_id): glibc always defines AF_LINK, so only diff --git a/lib/uuid/Makefile.in b/lib/uuid/Makefile.in index 82a351a4..14d3f17e 100644 --- a/lib/uuid/Makefile.in +++ b/lib/uuid/Makefile.in @@ -60,11 +60,12 @@ BSDLIB_INSTALL_DIR = $(root_libdir) @MAKEFILE_CHECKER@ .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 $< -@BSDLIB_CMT@ $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $< + @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 $< all:: tst_uuid uuid_time $(SMANPAGES) @@ -72,41 +73,53 @@ $(top_builddir)/lib/uuid/uuid_types.h: $(srcdir)/uuid_types.h.in $(top_builddir) cd $(top_builddir); CONFIG_FILES=$(my_dir)/uuid_types.h ./config.status tst_uuid.o: $(srcdir)/tst_uuid.c - $(CC) $(ALL_CFLAGS) -c $(srcdir)/tst_uuid.c -o tst_uuid.o + @echo " CC $@" + @$(CC) $(ALL_CFLAGS) -c $(srcdir)/tst_uuid.c -o tst_uuid.o tst_uuid: tst_uuid.o $(DEPSTATIC_LIBUUID) - $(CC) $(ALL_LDFLAGS) -o tst_uuid tst_uuid.o $(STATIC_LIBUUID) + @echo " LD $<" + @$(CC) $(ALL_LDFLAGS) -o tst_uuid tst_uuid.o $(STATIC_LIBUUID) uuid_time: $(srcdir)/uuid_time.c $(DEPLIBUUID) - $(CC) $(ALL_CFLAGS) -DDEBUG -o uuid_time $(srcdir)/uuid_time.c \ + @echo " LD $<" + @$(CC) $(ALL_CFLAGS) -DDEBUG -o uuid_time $(srcdir)/uuid_time.c \ $(LIBUUID) uuid.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid.3.in - $(SUBSTITUTE_UPTIME) $(srcdir)/uuid.3.in uuid.3 + @echo " SUBST $<" + @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid.3.in uuid.3 uuid_clear.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_clear.3.in - $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_clear.3.in uuid_clear.3 + @echo " SUBST $<" + @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_clear.3.in uuid_clear.3 uuid_compare.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_compare.3.in - $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_compare.3.in uuid_compare.3 + @echo " SUBST $<" + @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_compare.3.in uuid_compare.3 uuid_copy.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_copy.3.in - $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_copy.3.in uuid_copy.3 + @echo " SUBST $<" + @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_copy.3.in uuid_copy.3 uuid_generate.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_generate.3.in - $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_generate.3.in uuid_generate.3 + @echo " SUBST $<" + @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_generate.3.in uuid_generate.3 uuid_is_null.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_is_null.3.in - $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_is_null.3.in uuid_is_null.3 + @echo " SUBST $<" + @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_is_null.3.in uuid_is_null.3 uuid_parse.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_parse.3.in - $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_parse.3.in uuid_parse.3 + @echo " SUBST $<" + @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_parse.3.in uuid_parse.3 uuid_time.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_time.3.in - $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_time.3.in uuid_time.3 + @echo " SUBST $<" + @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_time.3.in uuid_time.3 uuid_unparse.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_unparse.3.in - $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_unparse.3.in uuid_unparse.3 + @echo " SUBST $<" + @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_unparse.3.in uuid_unparse.3 installdirs:: $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir) \ diff --git a/misc/ChangeLog b/misc/ChangeLog index 1e3fe450..06c8c51e 100644 --- a/misc/ChangeLog +++ b/misc/ChangeLog @@ -1,3 +1,8 @@ +2004-11-30 Theodore Ts'o <tytso@mit.edu> + + * Makefile.in: Use Linux-kernel-style makefile output to make it + easier to see errors/warnings. + 2004-11-19 Theodore Ts'o <tytso@mit.edu> * mke2fs.8.in: Removed the word "destructive" when describing the diff --git a/misc/Makefile.in b/misc/Makefile.in index 8decf58f..e29ece22 100644 --- a/misc/Makefile.in +++ b/misc/Makefile.in @@ -58,29 +58,36 @@ LIBS_E2P= $(LIBE2P) $(LIBCOM_ERR) DEPLIBS_E2P= $(LIBE2P) $(LIBCOM_ERR) .c.o: - $(CC) -c $(ALL_CFLAGS) $< -o $@ + @echo " CC $<" + @$(CC) -c $(ALL_CFLAGS) $< -o $@ all:: $(SPROGS) $(UPROGS) $(USPROGS) $(SMANPAGES) $(UMANPAGES) $(LPROGS) findsuper: findsuper.o - $(CC) $(ALL_LDFLAGS) -o findsuper findsuper.o + @echo " LD $@" + @$(CC) $(ALL_LDFLAGS) -o findsuper findsuper.o e2initrd_helper: e2initrd_helper.o $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBS_BLKID) - $(CC) $(ALL_LDFLAGS) -o e2initrd_helper e2initrd_helper.o $(LIBS) \ + @echo " LD $@" + @$(CC) $(ALL_LDFLAGS) -o e2initrd_helper e2initrd_helper.o $(LIBS) \ $(LIBS_BLKID) $(LIBS_E2P) $(LIBINTL) tune2fs: $(TUNE2FS_OBJS) $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBS_BLKID) - $(CC) $(ALL_LDFLAGS) -o tune2fs $(TUNE2FS_OBJS) $(LIBS) \ + @echo " LD $@" + @$(CC) $(ALL_LDFLAGS) -o tune2fs $(TUNE2FS_OBJS) $(LIBS) \ $(LIBS_BLKID) $(LIBS_E2P) $(LIBINTL) blkid: $(BLKID_OBJS) $(DEPLIBS_BLKID) - $(CC) $(ALL_LDFLAGS) -o blkid $(BLKID_OBJS) $(LIBS_BLKID) $(LIBINTL) + @echo " LD $@" + @$(CC) $(ALL_LDFLAGS) -o blkid $(BLKID_OBJS) $(LIBS_BLKID) $(LIBINTL) e2image: $(E2IMAGE_OBJS) $(DEPLIBS) - $(CC) $(ALL_LDFLAGS) -o e2image $(E2IMAGE_OBJS) $(LIBS) $(LIBINTL) + @echo " LD $@" + @$(CC) $(ALL_LDFLAGS) -o e2image $(E2IMAGE_OBJS) $(LIBS) $(LIBINTL) base_device: base_device.c - $(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(srcdir)/base_device.c \ + @echo " LD $@" + @$(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(srcdir)/base_device.c \ -DDEBUG -o base_device check:: base_device @@ -88,92 +95,120 @@ check:: base_device cmp $(srcdir)/base_device.tst base_device.out mklost+found: $(MKLPF_OBJS) - $(CC) $(ALL_LDFLAGS) -o mklost+found $(MKLPF_OBJS) $(LIBINTL) + @echo " LD $@" + @$(CC) $(ALL_LDFLAGS) -o mklost+found $(MKLPF_OBJS) $(LIBINTL) mke2fs: $(MKE2FS_OBJS) $(DEPLIBS) $(LIBE2P) $(DEPLIBUUID) $(DEPLIBS_BLKID) - $(CC) $(ALL_LDFLAGS) -o mke2fs $(MKE2FS_OBJS) $(LIBS) $(LIBS_BLKID) \ + @echo " LD $@" + @$(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) - $(CC) $(ALL_LDFLAGS) -static -o mke2fs.static $(MKE2FS_OBJS) \ + @echo " LD $@" + @$(CC) $(ALL_LDFLAGS) -static -o mke2fs.static $(MKE2FS_OBJS) \ $(STATIC_LIBS) $(STATIC_LIBE2P) $(STATIC_LIBBLKID) \ $(STATIC_LIBUUID) $(LIBINTL) resize2fs: resize2fs.o $(DEPLIBS) - $(CC) $(ALL_LDFLAGS) -o resize2fs resize2fs.o $(LIBS) $(LIBINTL) + @echo " LD $@" + @$(CC) $(ALL_LDFLAGS) -o resize2fs resize2fs.o $(LIBS) $(LIBINTL) chattr: $(CHATTR_OBJS) $(DEPLIBS_E2P) - $(CC) $(ALL_LDFLAGS) -o chattr $(CHATTR_OBJS) $(LIBS_E2P) $(LIBINTL) + @echo " LD $@" + @$(CC) $(ALL_LDFLAGS) -o chattr $(CHATTR_OBJS) $(LIBS_E2P) $(LIBINTL) lsattr: $(LSATTR_OBJS) $(DEPLIBS_E2P) - $(CC) $(ALL_LDFLAGS) -o lsattr $(LSATTR_OBJS) $(LIBS_E2P) $(LIBINTL) + @echo " LD $@" + @$(CC) $(ALL_LDFLAGS) -o lsattr $(LSATTR_OBJS) $(LIBS_E2P) $(LIBINTL) uuidgen: $(UUIDGEN_OBJS) $(DEPLIBUUID) - $(CC) $(ALL_LDFLAGS) -o uuidgen $(UUIDGEN_OBJS) $(LIBUUID) $(LIBINTL) + @echo " LD $@" + @$(CC) $(ALL_LDFLAGS) -o uuidgen $(UUIDGEN_OBJS) $(LIBUUID) $(LIBINTL) dumpe2fs: $(DUMPE2FS_OBJS) $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBUUID) - $(CC) $(ALL_LDFLAGS) -o dumpe2fs $(DUMPE2FS_OBJS) $(LIBS) \ + @echo " LD $@" + @$(CC) $(ALL_LDFLAGS) -o dumpe2fs $(DUMPE2FS_OBJS) $(LIBS) \ $(LIBS_E2P) $(LIBUUID) $(LIBINTL) fsck: $(FSCK_OBJS) $(DEBLIBS_BLKID) - $(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBS_BLKID) $(LIBINTL) + @echo " LD $@" + @$(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBS_BLKID) $(LIBINTL) badblocks: $(BADBLOCKS_OBJS) $(DEPLIBS) - $(CC) $(ALL_LDFLAGS) -o badblocks $(BADBLOCKS_OBJS) $(LIBS) $(LIBINTL) + @echo " LD $@" + @$(CC) $(ALL_LDFLAGS) -o badblocks $(BADBLOCKS_OBJS) $(LIBS) $(LIBINTL) logsave: logsave.o - $(CC) $(ALL_LDFLAGS) -o logsave logsave.o + @echo " LD $@" + @$(CC) $(ALL_LDFLAGS) -o logsave logsave.o filefrag: $(FILEFRAG_OBJS) - $(CC) $(ALL_LDFLAGS) -o filefrag $(FILEFRAG_OBJS) + @echo " LD $@" + @$(CC) $(ALL_LDFLAGS) -o filefrag $(FILEFRAG_OBJS) tune2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/tune2fs.8.in - $(SUBSTITUTE_UPTIME) $(srcdir)/tune2fs.8.in tune2fs.8 + @echo " SUBST $@" + @$(SUBSTITUTE_UPTIME) $(srcdir)/tune2fs.8.in tune2fs.8 mklost+found.8: $(DEP_SUBSTITUTE) $(srcdir)/mklost+found.8.in - $(SUBSTITUTE_UPTIME) $(srcdir)/mklost+found.8.in mklost+found.8 + @echo " SUBST $@" + @$(SUBSTITUTE_UPTIME) $(srcdir)/mklost+found.8.in mklost+found.8 mke2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/mke2fs.8.in - $(SUBSTITUTE_UPTIME) $(srcdir)/mke2fs.8.in mke2fs.8 + @echo " SUBST $@" + @$(SUBSTITUTE_UPTIME) $(srcdir)/mke2fs.8.in mke2fs.8 e2label.8: $(DEP_SUBSTITUTE) $(srcdir)/e2label.8.in - $(SUBSTITUTE_UPTIME) $(srcdir)/e2label.8.in e2label.8 + @echo " SUBST $@" + @$(SUBSTITUTE_UPTIME) $(srcdir)/e2label.8.in e2label.8 findfs.8: $(DEP_SUBSTITUTE) $(srcdir)/findfs.8.in - $(SUBSTITUTE_UPTIME) $(srcdir)/findfs.8.in findfs.8 + @echo " SUBST $@" + @$(SUBSTITUTE_UPTIME) $(srcdir)/findfs.8.in findfs.8 e2image.8: $(DEP_SUBSTITUTE) $(srcdir)/e2image.8.in - $(SUBSTITUTE_UPTIME) $(srcdir)/e2image.8.in e2image.8 + @echo " SUBST $@" + @$(SUBSTITUTE_UPTIME) $(srcdir)/e2image.8.in e2image.8 dumpe2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/dumpe2fs.8.in - $(SUBSTITUTE_UPTIME) $(srcdir)/dumpe2fs.8.in dumpe2fs.8 + @echo " SUBST $@" + @$(SUBSTITUTE_UPTIME) $(srcdir)/dumpe2fs.8.in dumpe2fs.8 badblocks.8: $(DEP_SUBSTITUTE) $(srcdir)/badblocks.8.in - $(SUBSTITUTE_UPTIME) $(srcdir)/badblocks.8.in badblocks.8 + @echo " SUBST $@" + @$(SUBSTITUTE_UPTIME) $(srcdir)/badblocks.8.in badblocks.8 fsck.8: $(DEP_SUBSTITUTE) $(srcdir)/fsck.8.in - $(SUBSTITUTE_UPTIME) $(srcdir)/fsck.8.in fsck.8 + @echo " SUBST $@" + @$(SUBSTITUTE_UPTIME) $(srcdir)/fsck.8.in fsck.8 blkid.8: $(DEP_SUBSTITUTE) $(srcdir)/blkid.8.in - $(SUBSTITUTE_UPTIME) $(srcdir)/blkid.8.in blkid.8 + @echo " SUBST $@" + @$(SUBSTITUTE_UPTIME) $(srcdir)/blkid.8.in blkid.8 logsave.8: $(DEP_SUBSTITUTE) $(srcdir)/logsave.8.in - $(SUBSTITUTE_UPTIME) $(srcdir)/logsave.8.in logsave.8 + @echo " SUBST $@" + @$(SUBSTITUTE_UPTIME) $(srcdir)/logsave.8.in logsave.8 chattr.1: $(DEP_SUBSTITUTE) $(srcdir)/chattr.1.in - $(SUBSTITUTE_UPTIME) $(srcdir)/chattr.1.in chattr.1 + @echo " SUBST $@" + @$(SUBSTITUTE_UPTIME) $(srcdir)/chattr.1.in chattr.1 lsattr.1: $(DEP_SUBSTITUTE) $(srcdir)/lsattr.1.in - $(SUBSTITUTE_UPTIME) $(srcdir)/lsattr.1.in lsattr.1 + @echo " SUBST $@" + @$(SUBSTITUTE_UPTIME) $(srcdir)/lsattr.1.in lsattr.1 uuidgen.1: $(DEP_SUBSTITUTE) $(srcdir)/uuidgen.1.in - $(SUBSTITUTE_UPTIME) $(srcdir)/uuidgen.1.in uuidgen.1 + @echo " SUBST $@" + @$(SUBSTITUTE_UPTIME) $(srcdir)/uuidgen.1.in uuidgen.1 blkid.1: $(DEP_SUBSTITUTE) $(srcdir)/blkid.1.in - $(SUBSTITUTE_UPTIME) $(srcdir)/blkid.1.in blkid.1 + @echo " SUBST $@" + @$(SUBSTITUTE_UPTIME) $(srcdir)/blkid.1.in blkid.1 filefrag.8: $(DEP_SUBSTITUTE) $(srcdir)/filefrag.8.in - $(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8 + @echo " SUBST $@" + @$(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8 installdirs: $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sbindir) \ diff --git a/po/ChangeLog b/po/ChangeLog index b1dad15e..841a67ba 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,8 @@ +2004-11-30 Theodore Ts'o <tytso@mit.edu> + + * Makefile.in.in: Use Linux-kernel-style makefile output to make it + easier to see errors/warnings. + 2004-11-09 Theodore Ts'o <tytso@mit.edu> * it.po: Updated Italian translation. diff --git a/po/Makefile.in.in b/po/Makefile.in.in index 501c1dd7..7fadb882 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -64,7 +64,7 @@ CATALOGS = @CATALOGS@ .po.gmo: @lang=`echo $* | sed -e 's,.*/,,'`; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \ + echo " MSGFMT $${lang}.po"; \ $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $(srcdir)/$${lang}.po && mv t-$${lang}.gmo $${lang}.gmo .sin.sed: @@ -108,8 +108,8 @@ $(srcdir)/$(DOMAIN).pot: $(POFILES): $(srcdir)/$(DOMAIN).pot @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \ - cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot + echo " MSGMERGE $${lang}.po"; \ + cd $(srcdir) && $(MSGMERGE_UPDATE) -q $${lang}.po $(DOMAIN).pot install: install-exec install-data @@ -283,7 +283,7 @@ update-po: Makefile tmpdir=`pwd`; \ echo "$$lang:"; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ + echo " MSGMERGE $$lang.po"; \ cd $(srcdir); \ if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ diff --git a/resize/ChangeLog b/resize/ChangeLog index 1cc56f28..50c7469d 100644 --- a/resize/ChangeLog +++ b/resize/ChangeLog @@ -1,3 +1,8 @@ +2004-11-30 Theodore Ts'o <tytso@mit.edu> + + * Makefile.in: Use Linux-kernel-style makefile output to make it + easier to see errors/warnings. + 2004-09-17 Theodore Ts'o <tytso@mit.edu> * resize2fs.c (check_and_change_inodes): Fix debugging printf to diff --git a/resize/Makefile.in b/resize/Makefile.in index c9dff22f..ee64bb3c 100644 --- a/resize/Makefile.in +++ b/resize/Makefile.in @@ -32,22 +32,27 @@ STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(LIBINTL) STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) .c.o: - $(CC) -c $(ALL_CFLAGS) $< -o $@ + @echo " CC $<" + @$(CC) -c $(ALL_CFLAGS) $< -o $@ all:: $(PROGS) $(TEST_PROGS) $(MANPAGES) resize2fs: $(RESIZE_OBJS) $(DEPLIBS) - $(CC) $(ALL_LDFLAGS) -o resize2fs $(RESIZE_OBJS) $(LIBS) + @echo " LD $@" + @$(CC) $(ALL_LDFLAGS) -o resize2fs $(RESIZE_OBJS) $(LIBS) resize2fs.static: $(RESIZE_OBJS) $(STATIC_DEPLIBS) - $(LD) $(ALL_LDFLAGS) $(LDFLAG_STATIC) -o resize2fs.static \ + @echo " LD $@" + @$(LD) $(ALL_LDFLAGS) $(LDFLAG_STATIC) -o resize2fs.static \ $(RESIZE_OBJS) $(STATIC_LIBS) resize2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/resize2fs.8.in - $(SUBSTITUTE_UPTIME) $(srcdir)/resize2fs.8.in resize2fs.8 + @echo " SUBST $@" + @$(SUBSTITUTE_UPTIME) $(srcdir)/resize2fs.8.in resize2fs.8 test_extent: $(TEST_EXTENT_OBJS) - $(CC) $(ALL_LDFLAGS) -o test_extent $(TEST_EXTENT_OBJS) $(LIBS) + @echo " LD $@" + @$(CC) $(ALL_LDFLAGS) -o test_extent $(TEST_EXTENT_OBJS) $(LIBS) installdirs: $(top_srcdir)/mkinstalldirs $(DESTDIR)$(root_sbindir) \ diff --git a/tests/progs/ChangeLog b/tests/progs/ChangeLog index 3bb682b6..36a0d4b2 100644 --- a/tests/progs/ChangeLog +++ b/tests/progs/ChangeLog @@ -1,3 +1,8 @@ +2004-11-30 Theodore Ts'o <tytso@mit.edu> + + * Makefile.in: Use Linux-kernel-style makefile output to make it + easier to see errors/warnings. + 2004-02-28 Theodore Ts'o <tytso@mit.edu> * Release of E2fsprogs 1.35 diff --git a/tests/progs/Makefile.in b/tests/progs/Makefile.in index 7b57338c..ad735b62 100644 --- a/tests/progs/Makefile.in +++ b/tests/progs/Makefile.in @@ -25,21 +25,26 @@ LIBS= $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR) DEPLIBS= $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR) .c.o: - $(CC) -c $(ALL_CFLAGS) $< -o $@ + @echo " CC $<" + @$(CC) -c $(ALL_CFLAGS) $< -o $@ all:: $(PROGS) test_rel: $(TEST_REL_OBJS) $(DEPLIBS) - $(LD) $(ALL_LDFLAGS) -o test_rel $(TEST_REL_OBJS) $(LIBS) + @echo " LD $@" + @$(LD) $(ALL_LDFLAGS) -o test_rel $(TEST_REL_OBJS) $(LIBS) test_rel_cmds.c: test_rel_cmds.ct - $(MK_CMDS) $(srcdir)/test_rel_cmds.ct + @echo " MK_CMDS $@" + @$(MK_CMDS) $(srcdir)/test_rel_cmds.ct test_icount: $(TEST_ICOUNT_OBJS) $(DEPLIBS) - $(LD) $(ALL_LDFLAGS) -o test_icount $(TEST_ICOUNT_OBJS) $(LIBS) + @echo " LD $@" + @$(LD) $(ALL_LDFLAGS) -o test_icount $(TEST_ICOUNT_OBJS) $(LIBS) test_icount_cmds.c: test_icount_cmds.ct - $(MK_CMDS) $(srcdir)/test_icount_cmds.ct + @echo " MK_CMDS $@" + @$(MK_CMDS) $(srcdir)/test_icount_cmds.ct clean: $(RM) -f $(PROGS) test_rel_cmds.c test_icount_cmds.c \ diff --git a/util/ChangeLog b/util/ChangeLog index ec2a01c0..60574226 100644 --- a/util/ChangeLog +++ b/util/ChangeLog @@ -1,3 +1,8 @@ +2004-11-30 Theodore Ts'o <tytso@mit.edu> + + * Makefile.in: Use Linux-kernel-style makefile output to make it + easier to see errors/warnings. + 2004-04-03 Theodore Ts'o <tytso@mit.edu> * subst.c (main): Add new option to update the timestamp of the diff --git a/util/Makefile.in b/util/Makefile.in index 1c5c9a17..634cd753 100644 --- a/util/Makefile.in +++ b/util/Makefile.in @@ -14,18 +14,21 @@ SRCS = $(srcdir)/subst.c @MCONFIG@ .c.o: - $(BUILD_CC) -c $(ALL_CFLAGS) $< -o $@ + @echo " CC $<" + @$(BUILD_CC) -c $(ALL_CFLAGS) $< -o $@ PROGS= subst all:: $(PROGS) gen-tarball subst: subst.o - $(BUILD_CC) $(ALL_LDFLAGS) -o subst subst.o + @echo " LD $@" + @$(BUILD_CC) $(ALL_LDFLAGS) -o subst subst.o gen-tarball: $(srcdir)/gen-tarball.in $(top_builddir)/config.status - cd $(top_builddir); CONFIG_FILES=util/gen-tarball ./config.status - chmod +x gen-tarball + @echo " CONFIG.STATUS $@" + @cd $(top_builddir); CONFIG_FILES=util/gen-tarball ./config.status + @chmod +x gen-tarball tarballs: gen-tarball sh gen-tarball debian |