diff options
| author | Daniel Kiper <daniel.kiper@oracle.com> | 2013-05-10 17:33:54 +0200 |
|---|---|---|
| committer | Ian Jackson <Ian.Jackson@eu.citrix.com> | 2013-07-17 12:29:34 +0100 |
| commit | ede071d56bb9947ee6bcf2b78f7614ae6bec4dd1 (patch) | |
| tree | 1c8e4fec1a078ac77f93e733ebebe555e235fe29 | |
| parent | a2b1a38013f6ca8399808cfa94bf84ea4f1133ac (diff) | |
| download | xen-ede071d56bb9947ee6bcf2b78f7614ae6bec4dd1.tar.gz xen-ede071d56bb9947ee6bcf2b78f7614ae6bec4dd1.tar.bz2 xen-ede071d56bb9947ee6bcf2b78f7614ae6bec4dd1.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>
(cherry picked from commit 667d8a84b244d02e9c6a2d02d6a02fc90c2efb4e)
| -rw-r--r-- | tools/libfsimage/Rules.mk | 2 | ||||
| -rw-r--r-- | 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 0e29c25bb3..81d79817cf 100644 --- a/tools/libfsimage/Rules.mk +++ b/tools/libfsimage/Rules.mk @@ -26,7 +26,7 @@ fs-install: fs-all $(FSLIB): $(PIC_OBJS) $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $^ -lfsimage $(FS_LIBDEPS) -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 afb1e96e0d..15b6379db6 100644 --- a/tools/libfsimage/common/Makefile +++ b/tools/libfsimage/common/Makefile @@ -28,8 +28,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 $< $@ |