Skip to contentSkip to conversation

: tools: delete qemu during make distclean

PATCH New Gianni Tedesco 2 participants 6 messages Oct 25, 2010 – Oct 28, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 : tools: delete qemu during make distclean

The top-level makefile claims this to be the expected behaviour so make it so.

tools/Makefile +6 -0
diff -r 2e8bdff60d01 tools/Makefile
@@ -30,7 +30,12 @@ SUBDIRS-y += libfsimage
 SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen
 SUBDIRS-$(CONFIG_Linux) += fs-back
 SUBDIRS-$(CONFIG_NetBSD) += fs-back
+
+# do not recurse in to a dir we are about to delete
+ifneq "$(MAKECMDGOALS)" "distclean"
 SUBDIRS-$(CONFIG_IOEMU) += ioemu-dir
+endif
+
 SUBDIRS-y += xenpmd
 SUBDIRS-y += libxl
 SUBDIRS-y += remus
@@ -67,6 +72,7 @@ clean: subdirs-clean
 
 .PHONY: distclean
 distclean: subdirs-distclean
+	rm -rf ioemu-dir ioemu-remote
 
 ifneq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
 IOEMU_CONFIGURE_CROSS ?= --cpu=$(XEN_TARGET_ARCH) \
#1 lore raw

PATCH 1/1 : blktap2: delete symlinks and deps during make clean

tools/blktap2/control/Makefile +1 -0
diff -r 2e8bdff60d01 tools/blktap2/control/Makefile
@@ -73,6 +73,7 @@ install: $(IBIN) $(LIB_STATIC) $(LIB_SHA
 
 clean:
 	rm -f $(OBJS) $(PICS) $(DEPS) $(IBIN) $(LIB_STATIC) $(LIB_SHARED)
+	rm -f $(LIBNAME).so $(LIBSONAME)
 	rm -f *~
 
 .PHONY: all build clean install
tools/blktap2/drivers/Makefile +1 -1
diff -r 2e8bdff60d01 tools/blktap2/drivers/Makefile
@@ -118,6 +118,6 @@ install: all
 	$(INSTALL_PROG) $(IBIN) $(LOCK_UTIL) $(QCOW_UTIL) $(DESTDIR)$(INST_DIR)
 
 clean:
-	rm -rf *.o *~ xen TAGS $(IBIN) $(LIB) $(LOCK_UTIL) $(QCOW_UTIL)
+	rm -rf .*.d *.o *~ xen TAGS $(IBIN) $(LIB) $(LOCK_UTIL) $(QCOW_UTIL)
 
 .PHONY: clean install
#2 lore raw

Re: [PATCH]: blktap2: delete symlinks and deps during make clean [and 4 more messages]

Gianni Tedesco writes ("[PATCH]: blktap2: delete symlinks and deps during make clean"):

Quoted 1 line

Thanks, I have applied those 5 Makefile cleanups.

Ian.

#3 lore raw

PATCH 1/1 : libxl: delete temporary files during make clean

tools/libxl/Makefile +1 -1
diff -r 2e8bdff60d01 tools/libxl/Makefile
@@ -118,7 +118,7 @@ install: all
 .PHONY: clean
 clean:
 	$(RM) -f _*.h *.o *.so* *.a $(CLIENTS) $(DEPS)
-	$(RM) -f _*.c
+	$(RM) -f _*.c *.pyc _libxl_paths.*.tmp
 #	$(RM) -f $(AUTOSRCS) $(AUTOINCS)
 
 distclean: clean
#4 lore raw

PATCH 1/1 : ocaml: delete dependency files during make clean

tools/ocaml/Makefile.rules +1 -1
diff -r 2e8bdff60d01 tools/ocaml/Makefile.rules
@@ -45,7 +45,7 @@ ALL_OCAML_OBJ_SOURCES=$(addsuffix .ml, $
 	$(call quiet-command, $(OCAMLDEP) $(ALL_OCAML_OBJ_SOURCES) *.mli $o,MLDEP,)
 
 clean: $(CLEAN_HOOKS)
-	$(Q)rm -f *.o *.so *.a *.cmo *.cmi *.cma *.cmx *.cmxa *.annot $(LIBS) $(PROGRAMS) $(GENERATED_FILES) .ocamldep.make
+	$(Q)rm -f .*.d *.o *.so *.a *.cmo *.cmi *.cma *.cmx *.cmxa *.annot $(LIBS) $(PROGRAMS) $(GENERATED_FILES) .ocamldep.make
 
 quiet-command = $(if $(V),$1,@printf " %-8s %s\n" "$2" "$3" && $1)
#5 lore raw

PATCH 1/1 : correctly generate dependencies for gdbsx

gdbsx hacks CFLAGS to remove optimisations for easier debugging, however this breaks dep generation due to an early evaluation of CFLAGS and leaves stale files called "..d" after a make clean. We could possibly fix this by separating dep generation from the rest of CFLAGS but it seems a little invasive. The gdbsx hackers can do their own thing during development and testing anyway...

tools/debugger/gdbsx/Rules.mk +0 -5
diff -r 2e8bdff60d01 tools/debugger/gdbsx/Rules.mk
@@ -2,8 +2,3 @@ include $(XEN_ROOT)/tools/Rules.mk
 
 CFLAGS   += -Werror -Wmissing-prototypes 
 # (gcc 4.3x and later)   -Wconversion -Wno-sign-conversion
-
-# just in case have to debug gdbsx, keep life simple.
-TMPFLAGS := $(CFLAGS)
-CFLAGS := $(filter-out -O% -DNDEBUG -fomit-frame-pointer, $(TMPFLAGS))
-CFLAGS += -O0
tools/debugger/gdbsx/gx/Makefile +1 -1
diff -r 2e8bdff60d01 tools/debugger/gdbsx/gx/Makefile
@@ -9,7 +9,7 @@ all: gx_all.a
 
 .PHONY: clean
 clean:
-	rm -rf gx_all.a *.o 
+	rm -rf gx_all.a *.o .*.d
 
 
 #%.o: %.c $(GX_HDRS) Makefile
tools/debugger/gdbsx/xg/Makefile +1 -1
diff -r 2e8bdff60d01 tools/debugger/gdbsx/xg/Makefile
@@ -32,5 +32,5 @@ xen-headers:
 
 .PHONY: clean
 clean:
-	rm -rf xen xg_all.a $(XG_OBJS) 
+	rm -rf xen xg_all.a $(XG_OBJS)  .*.d