Daniel Kiper
2013-May-10 15:33 UTC
[PATCH v2 1/1] tools/libfsimage: Fix clean and distclean make targets
If there is a single colon for a given target and the target is redefined in another place (e.g. in included file) then make executes only new target and displays following warning: Makefile:35: warning: overriding commands for target `clean'' tools/libfsimage/common/../../../tools/libfsimage/Rules.mk:25: warning: ignoring old commands for target `clean'' To cope with that issue define all required targets as double-colon rules. Additionally, remove some redundant stuff. Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com> --- tools/libfsimage/Rules.mk | 2 +- tools/libfsimage/common/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libfsimage/Rules.mk b/tools/libfsimage/Rules.mk index e4b2a91..8a23655 100644 --- a/tools/libfsimage/Rules.mk +++ b/tools/libfsimage/Rules.mk @@ -21,7 +21,7 @@ fs-install: fs-all $(FSLIB): $(PIC_OBJS) $(CC) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $^ -lfsimage $(FS_LIBDEPS) $(APPEND_LDFLAGS) -clean distclean: +clean distclean:: rm -f $(PIC_OBJS) $(FSLIB) $(DEPS) -include $(DEPS) diff --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile index f0ee3ab..cbd60b4 100644 --- a/tools/libfsimage/common/Makefile +++ b/tools/libfsimage/common/Makefile @@ -31,8 +31,8 @@ install: all $(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DATA) fsimage_grub.h $(DESTDIR)$(INCLUDEDIR) -clean distclean: - rm -f $(PIC_OBJS) $(LIB) $(DEPS) +clean distclean:: + rm -f $(LIB) libfsimage.so: libfsimage.so.$(MAJOR) ln -sf $< $@ -- 1.7.10.4
Ian Campbell
2013-May-13 10:44 UTC
Re: [PATCH v2 1/1] tools/libfsimage: Fix clean and distclean make targets
On Fri, 2013-05-10 at 16:33 +0100, Daniel Kiper wrote:> If there is a single colon for a given target and the target > is redefined in another place (e.g. in included file) then > make executes only new target and displays following warning: > > Makefile:35: warning: overriding commands for target `clean'' > tools/libfsimage/common/../../../tools/libfsimage/Rules.mk:25: > warning: ignoring old commands for target `clean'' > > To cope with that issue define all required targets as double-colon > rules. Additionally, remove some redundant stuff. > > Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>Acked-by: Ian Campbell <ian.campbell@citrix.com> and pushed