pixman: Branch 'master' - 4 commits

[Andrea Canciani]

 Makefile.win32.common |   13 +++++++++----
 test/Makefile.win32   |   10 ++++------
 2 files changed, 13 insertions(+), 10 deletions(-)

New commits:
commit af0689716a011de3645aaefc57138c9d1d0e3ae6
Author: Simon Richter <Simon.Richter at hogyros.de>
Date:   Tue Dec 22 22:45:33 2015 +0100

    build: Use `del` instead of `rm` on `cmd.exe` shells
    
    The `rm` command is not usually available when running on Win32 in a
    `cmd.exe` shell. Instead the shell provides the `del` builtin, which
    has somewhat more limited wildcars expansion and error handling.
    
    This makes all of the Makefile targets work on Win32 both using
    `cmd.exe` and using the MSYS environment.
    
    Signed-off-by: Simon Richter <Simon.Richter at hogyros.de>
    Signed-off-by: Andrea Canciani <ranma42 at gmail.com>
    Acked-by: Oded Gabbay <oded.gabbay at gmail.com>

diff --git a/Makefile.win32.common b/Makefile.win32.common
index a759ddc..756fc94 100644
--- a/Makefile.win32.common
+++ b/Makefile.win32.common
@@ -5,6 +5,10 @@ LD = link
 AR = lib
 PERL = perl
 
+ifneq ($(shell echo ""),)
+RM = del
+endif
+
 ifeq ($(top_builddir),)
 top_builddir = $(top_srcdir)
 endif
@@ -51,7 +55,7 @@ $(CFG_VAR):
 $(CFG_VAR)/%.obj: %.c $(libpixman_headers) | $(CFG_VAR)
 	@$(CC) -c $(PIXMAN_CFLAGS) -Fo"$@" $<
 
-clean: inform
-	@$(RM) $(CFG_VAR)/*.{exe,ilk,lib,obj,pdb} || exit 0
+clean: inform $(CFG_VAR)
+	@cd $(CFG_VAR) && echo > silence_error.exe && $(RM) *.exe *.ilk *.lib *.obj *.pdb
 
 .PHONY: inform clean
commit 93b876c11063f58c87fd93ed41e4d3f483bf59ab
Author: Andrea Canciani <ranma42 at gmail.com>
Date:   Tue Dec 22 22:46:05 2015 +0100

    build: Do not use `mkdir -p` on Windows
    
    When the build is performed using `cmd.exe` as shell, the `mkdir`
    command does not support the `-p` flag. The ability to create multiple
    netsted folder is not used, hence it can be easily replaced by only
    creating the directory if it does not exist.
    
    This makes the build work on the `cmd.exe` shell, except for the
    `clean` targets.
    
    Signed-off-by: Andrea Canciani <ranma42 at gmail.com>
    Acked-by: Oded Gabbay <oded.gabbay at gmail.com>

diff --git a/Makefile.win32.common b/Makefile.win32.common
index b498c2f..a759ddc 100644
--- a/Makefile.win32.common
+++ b/Makefile.win32.common
@@ -45,9 +45,10 @@ endif
 endif
 endif
 
+$(CFG_VAR):
+	@mkdir $@
 
-$(CFG_VAR)/%.obj: %.c $(libpixman_headers)
-	@mkdir -p $(CFG_VAR)
+$(CFG_VAR)/%.obj: %.c $(libpixman_headers) | $(CFG_VAR)
 	@$(CC) -c $(PIXMAN_CFLAGS) -Fo"$@" $<
 
 clean: inform
commit cc35d01980df2e2d686568ef7f1216bcc809b5aa
Author: Andrea Canciani <ranma42 at gmail.com>
Date:   Wed Dec 23 11:15:59 2015 +0100

    build: Avoid phony `pixman` target in test/Makefile.win32
    
    Instead of explicitly depending on "pixman" for the "all" and "check"
    targets, rely on the dependency to the .lib file
    
    Signed-off-by: Andrea Canciani <ranma42 at gmail.com>
    Reviewed-by: Oded Gabbay <oded.gabbay at gmail.com>

diff --git a/test/Makefile.win32 b/test/Makefile.win32
index 6cfb4a7..bdd9b7f 100644
--- a/test/Makefile.win32
+++ b/test/Makefile.win32
@@ -16,9 +16,9 @@ OBJECTS = $(patsubst %.c, $(CFG_VAR)/%.obj, $(SOURCES))
 TESTS   = $(patsubst %,   $(CFG_VAR)/%.exe, $(TESTPROGRAMS))
 OTHERS  = $(patsubst %,   $(CFG_VAR)/%.exe, $(OTHERPROGRAMS))
 
-all: pixman inform $(TESTS) $(OTHERS)
+all: inform $(TESTS) $(OTHERS)
 
-check: pixman inform $(TESTS)
+check: inform $(TESTS)
 	@failures=0 ; \
 	total=0 ; \
 	for test in $(TESTS) ; \
@@ -46,9 +46,7 @@ $(CFG_VAR)/libutils.lib: $(libutils_OBJECTS)
 $(CFG_VAR)/%.exe: $(CFG_VAR)/%.obj $(TEST_LDADD)
 	@$(LD) $(PIXMAN_LDFLAGS) -OUT:$@ $^
 
-$(top_builddir)/pixman/$(CFG_VAR)/$(LIBRARY).lib: pixman
-
-pixman:
+$(top_builddir)/pixman/$(CFG_VAR)/$(LIBRARY).lib:
 	@$(MAKE) -C $(top_builddir)/pixman -f Makefile.win32
 
-.PHONY: all check pixman
+.PHONY: all check
commit ceb49cbda93a59bf41a5a9908114534208f8250c
Author: Andrea Canciani <ranma42 at gmail.com>
Date:   Tue Dec 22 21:53:14 2015 +0100

    build: Remove use of BUILT_SOURCES from Makefile.win32
    
    Since 3d81d89c292058522cce91338028d9b4c4a23c24 BUILT_SOURCES is not
    used anymore, but it was unintentionally left in Win32 Makefiles.
    
    Signed-off-by: Andrea Canciani <ranma42 at gmail.com>
    Reviewed-by: Oded Gabbay <oded.gabbay at gmail.com>

diff --git a/Makefile.win32.common b/Makefile.win32.common
index 777f94c..b498c2f 100644
--- a/Makefile.win32.common
+++ b/Makefile.win32.common
@@ -51,6 +51,6 @@ $(CFG_VAR)/%.obj: %.c $(libpixman_headers)
 	@$(CC) -c $(PIXMAN_CFLAGS) -Fo"$@" $<
 
 clean: inform
-	@$(RM) $(CFG_VAR)/*.{exe,ilk,lib,obj,pdb} $(BUILT_SOURCES) || exit 0
+	@$(RM) $(CFG_VAR)/*.{exe,ilk,lib,obj,pdb} || exit 0
 
 .PHONY: inform clean