Skip to contentSkip to conversation

Makefile: remove more generated files on clean

PATCH In review Michael S. Tsirkin 3 participants 4 messages Nov 16, 2011 – Nov 17, 2011 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 Makefile: remove more generated files on clean

make clean missed the source qmp files generated
by python. Fix that.

---
 Makefile |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
Makefile +2 -0
index 168093c..b335f2a 100644
@@ -8,6 +8,7 @@ ifeq ($(TRACE_BACKEND),dtrace)
 GENERATED_HEADERS += trace-dtrace.h
 endif
 GENERATED_HEADERS += qmp-commands.h qapi-types.h qapi-visit.h
+GENERATED_SOURCES += qmp-marshal.c qapi-types.c qapi-visit.c
 
 ifneq ($(wildcard config-host.mak),)
 # Put the all: rule here so that config-host.mak can contain dependencies.
@@ -227,6 +228,7 @@ clean:
 	rm -f trace.c trace.h trace.c-timestamp trace.h-timestamp
 	rm -f trace-dtrace.dtrace trace-dtrace.dtrace-timestamp
 	rm -f trace-dtrace.h trace-dtrace.h-timestamp
+	rm -f $(GENERATED_SOURCES)
 	rm -rf $(qapi-dir)
 	$(MAKE) -C tests clean
 	for d in $(ALL_SUBDIRS) $(QEMULIBS) libcacard; do \
Signature · 1 line
1.7.5.53.gc233e
Reviewed-by on v1 1/4
#1 lore raw
Quoted 21 lines · Michael S. Tsirkin

make clean missed the source qmp files generated
by python. Fix that.

---
  Makefile |    2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)
Makefile +1 -0
index 168093c..b335f2a 100644
@@ -8,6 +8,7 @@ ifeq ($(TRACE_BACKEND),dtrace)
  GENERATED_HEADERS += trace-dtrace.h
  endif
  GENERATED_HEADERS += qmp-commands.h qapi-types.h qapi-visit.h
+GENERATED_SOURCES += qmp-marshal.c qapi-types.c qapi-visit.c
 
  ifneq ($(wildcard config-host.mak),)
  # Put the all: rule here so that config-host.mak can contain dependencies.

Makefile clean: · line 234

Quoted 7 lines
Makefile +1 -0
@@ -227,6 +228,7 @@ clean:
  	rm -f trace.c trace.h trace.c-timestamp trace.h-timestamp
  	rm -f trace-dtrace.dtrace trace-dtrace.dtrace-timestamp
  	rm -f trace-dtrace.h trace-dtrace.h-timestamp
+	rm -f $(GENERATED_SOURCES)
  	rm -rf $(qapi-dir)
  	$(MAKE) -C tests clean
  	for d in $(ALL_SUBDIRS) $(QEMULIBS) libcacard; do \

Series looks good,

Paolo

#2 lore raw
In reply to Michael S. Tsirkin
Quoted 4 lines · On Wed, 16 Nov 2011 23:58:46 +0200 "Michael S. Tsirkin" <[email protected]> wrote:

make clean missed the source qmp files generated
by python. Fix that.

Michael, this series is for 1.0, right?

Quoted 24 lines
---
 Makefile |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
Makefile +2 -0
index 168093c..b335f2a 100644
@@ -8,6 +8,7 @@ ifeq ($(TRACE_BACKEND),dtrace)
 GENERATED_HEADERS += trace-dtrace.h
 endif
 GENERATED_HEADERS += qmp-commands.h qapi-types.h qapi-visit.h
+GENERATED_SOURCES += qmp-marshal.c qapi-types.c qapi-visit.c
 
 ifneq ($(wildcard config-host.mak),)
 # Put the all: rule here so that config-host.mak can contain dependencies.
@@ -227,6 +228,7 @@ clean:
 	rm -f trace.c trace.h trace.c-timestamp trace.h-timestamp
 	rm -f trace-dtrace.dtrace trace-dtrace.dtrace-timestamp
 	rm -f trace-dtrace.h trace-dtrace.h-timestamp
+	rm -f $(GENERATED_SOURCES)
 	rm -rf $(qapi-dir)
 	$(MAKE) -C tests clean
 	for d in $(ALL_SUBDIRS) $(QEMULIBS) libcacard; do \
#3 lore raw
Quoted 9 lines · Luiz Capitulino
Quoted 4 lines · On Wed, 16 Nov 2011 23:58:46 +0200 "Michael S. Tsirkin" <[email protected]> wrote:

make clean missed the source qmp files generated
by python. Fix that.

Michael, this series is for 1.0, right?

Yes, I think so.

Quoted 24 lines
Quoted 24 lines
---
 Makefile |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
Makefile +2 -0
index 168093c..b335f2a 100644
@@ -8,6 +8,7 @@ ifeq ($(TRACE_BACKEND),dtrace)
 GENERATED_HEADERS += trace-dtrace.h
 endif
 GENERATED_HEADERS += qmp-commands.h qapi-types.h qapi-visit.h
+GENERATED_SOURCES += qmp-marshal.c qapi-types.c qapi-visit.c
 
 ifneq ($(wildcard config-host.mak),)
 # Put the all: rule here so that config-host.mak can contain dependencies.
@@ -227,6 +228,7 @@ clean:
 	rm -f trace.c trace.h trace.c-timestamp trace.h-timestamp
 	rm -f trace-dtrace.dtrace trace-dtrace.dtrace-timestamp
 	rm -f trace-dtrace.h trace-dtrace.h-timestamp
+	rm -f $(GENERATED_SOURCES)
 	rm -rf $(qapi-dir)
 	$(MAKE) -C tests clean
 	for d in $(ALL_SUBDIRS) $(QEMULIBS) libcacard; do \