aboutsummaryrefslogtreecommitdiffstats
path: root/tools/libfsimage
diff options
context:
space:
mode:
authorDaniel Kiper <daniel.kiper@oracle.com>2013-05-10 17:33:54 +0200
committerIan Campbell <ian.campbell@citrix.com>2013-05-13 10:57:17 +0100
commit667d8a84b244d02e9c6a2d02d6a02fc90c2efb4e (patch)
treee4bd697d4875156366ec469e1afc05c8026f866b /tools/libfsimage
parent2569c54743c887ec6fbbba74efe56fb113b933fc (diff)
downloadxen-667d8a84b244d02e9c6a2d02d6a02fc90c2efb4e.tar.gz
xen-667d8a84b244d02e9c6a2d02d6a02fc90c2efb4e.tar.bz2
xen-667d8a84b244d02e9c6a2d02d6a02fc90c2efb4e.zip
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> Acked-by: Ian Campbell <ian.campbell@citrix.com>
Diffstat (limited to 'tools/libfsimage')
-rw-r--r--tools/libfsimage/Rules.mk2
-rw-r--r--tools/libfsimage/common/Makefile4
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/libfsimage/Rules.mk b/tools/libfsimage/Rules.mk
index e4b2a9158e..8a236552f7 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 f0ee3ab296..cbd60b41a7 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 $< $@