[Qemu-devel] [PATCH 0/6] *** SUBJECT HERE ***

[Qemu-devel] [PATCH 0/6] *** SUBJECT HERE ***

[Juan Quintela]

*** BLURB HERE ***

Juan Quintela (6):
  AIOLIBS is not used anywhere
  optionrom: remove use of implicit RM variable
  add build-all to .PHONY rules
  optionrom: create .PHONY variable
  Don't use implicit rules for Makefile
  configure and Makefile are not generated in qemu

 Makefile                   |    7 ++++++-
 configure                  |    1 -
 pc-bios/optionrom/Makefile |    3 ++-
 rules.mak                  |   12 ++++++++++++
 4 files changed, 20 insertions(+), 3 deletions(-)

[Qemu-devel] [PATCH 1/6] AIOLIBS is not used anywhere

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 configure |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/configure b/configure
index 69a5502..ad04880 100755
--- a/configure
+++ b/configure
@@ -1383,7 +1383,6 @@ fi

 ##########################################
 # linux-aio probe
-AIOLIBS=""

 if test "$linux_aio" != "no" ; then
   cat > $TMPC <<EOF
-- 
1.6.2.5

[Qemu-devel] [PATCH 2/6] optionrom: remove use of implicit RM variable

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 pc-bios/optionrom/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile
index d9b6639..2d3069a 100644
--- a/pc-bios/optionrom/Makefile
+++ b/pc-bios/optionrom/Makefile
@@ -24,4 +24,4 @@ build-all: multiboot.bin
 	$(call quiet-command,$(SHELL) $(SRC_PATH)/pc-bios/optionrom/signrom.sh $< $@,"  Signing $(TARGET_DIR)$@")

 clean:
-	$(RM) *.o *.d *.raw *.img *.bin *~
+	rm -f *.o *.d *.raw *.img *.bin *~
-- 
1.6.2.5

[Qemu-devel] [PATCH 3/6] add build-all to .PHONY rules

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index de7c2aa..2f0441e 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ config-host.mak:
 endif

 .PHONY: all clean cscope distclean dvi html info install install-doc \
-	recurse-all speed tar tarbin test
+	recurse-all speed tar tarbin test build-all

 VPATH=$(SRC_PATH):$(SRC_PATH)/hw

-- 
1.6.2.5

[Qemu-devel] [PATCH 4/6] optionrom: create .PHONY variable

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 pc-bios/optionrom/Makefile |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile
index 2d3069a..b01a54e 100644
--- a/pc-bios/optionrom/Makefile
+++ b/pc-bios/optionrom/Makefile
@@ -6,6 +6,7 @@ include ../../config-host.mak
 include $(SRC_PATH)/rules.mak

 VPATH=$(SRC_PATH)/pc-bios/optionrom
+.PHONY : all clean build-all

 CFLAGS := -Wall -Wstrict-prototypes -Werror -fomit-frame-pointer -fno-builtin
 CFLAGS += -I$(SRC_PATH)
-- 
1.6.2.5

[Qemu-devel] [PATCH 5/6] Don't use implicit rules for Makefile

[Juan Quintela]

This remove implicit rules + implicit variables.
Explicit rules like the generation of %.h and %.c from %.hx still works
as expected.

As an added bonus, now the output of make -d is readable.

As another added bonus, time spend on Makefiles is way smaller.
We run make -j3 in a fully compiled tree, and results are:

Before:

$ time make -j3
real 0m1.225s
user 0m1.660s
sys 0m0.253s

After:
$ time make -j3
real 0m0.422s
user 0m0.393s
sys 0m0.248s

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 rules.mak |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/rules.mak b/rules.mak
index 54ac88a..b380903 100644
--- a/rules.mak
+++ b/rules.mak
@@ -1,4 +1,16 @@

+# Don't use implicit rules or variables
+# we have explicit rules for everything
+MAKEFLAGS += -rR
+
+# Files with this suffixes are final, don't try to generate them
+# using implicit rules
+%.d:
+%.h:
+%.c:
+%.m:
+%.mak:
+
 %.o: %.c
 	$(call quiet-command,$(CC) $(QEMU_CFLAGS) $(CFLAGS) -c -o $@ $<,"  CC    $(TARGET_DIR)$@")

-- 
1.6.2.5

[Qemu-devel] [PATCH 6/6] configure and Makefile are not generated in qemu

[Juan Quintela]

Just say it to make

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/Makefile b/Makefile
index 2f0441e..c552739 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,11 @@ config-host.mak:
 	@exit 1
 endif

+# Don't try to regenerate Makefile or configure
+# We don't generate any of them
+Makefile: ;
+configure: ;
+
 .PHONY: all clean cscope distclean dvi html info install install-doc \
 	recurse-all speed tar tarbin test build-all

-- 
1.6.2.5