SwallowOS/image_pixman
1
0
Fork 0
mirror of https://github.com/SwallowOS/image_pixman synced 2025-11-05 06:29:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

build: Improve win32 build system

Browse Source 
Handle cross-directory dependencies using PHONY targets and clean up
some redundancies.
This commit is contained in:
Andrea Canciani
2012-06-21 06:07:07 +02:00
parent c89efdd211
commit 46e4faf8ef
4 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile.win32
View File

@@ -3,23 +3,23 @@ default: all
top_srcdir = . top_srcdir = .
include $(top_srcdir)/Makefile.win32.common include $(top_srcdir)/Makefile.win32.common
# Recursive targets all: pixman test
pixman_r:
pixman:
@$(MAKE) -C pixman -f Makefile.win32 @$(MAKE) -C pixman -f Makefile.win32
test_r: test:
@$(MAKE) -C test -f Makefile.win32 @$(MAKE) -C test -f Makefile.win32
clean_r: clean_r:
@$(MAKE) -C pixman -f Makefile.win32 clean @$(MAKE) -C pixman -f Makefile.win32 clean
@$(MAKE) -C test -f Makefile.win32 clean @$(MAKE) -C test -f Makefile.win32 clean
check_r: check:
@$(MAKE) -C test -f Makefile.win32 check @$(MAKE) -C test -f Makefile.win32 check
# Base targets
all: test_r
clean: clean_r clean: clean_r
check: check_r
.PHONY: all pixman test clean check

4
Makefile.win32.common
View File

@@ -46,9 +46,11 @@ endif
endif endif
$(CFG_VAR)/%.obj: %.c $(BUILT_SOURCES) $(CFG_VAR)/%.obj: %.c $(libpixman_headers)
@mkdir -p $(CFG_VAR) @mkdir -p $(CFG_VAR)
@$(CC) -c $(PIXMAN_CFLAGS) -Fo"$@" $< @$(CC) -c $(PIXMAN_CFLAGS) -Fo"$@" $<
clean: inform clean: inform
@$(RM) $(CFG_VAR)/*.{exe,ilk,lib,obj,pdb} $(BUILT_SOURCES) || exit 0 @$(RM) $(CFG_VAR)/*.{exe,ilk,lib,obj,pdb} $(BUILT_SOURCES) || exit 0
.PHONY: inform clean

2
pixman/Makefile.win32
View File

@@ -64,3 +64,5 @@ endif
# pixman linking # pixman linking
$(CFG_VAR)/$(LIBRARY).lib: $(OBJECTS) $(CFG_VAR)/$(LIBRARY).lib: $(OBJECTS)
@$(AR) $(PIXMAN_ARFLAGS) -OUT:$@ $^ @$(AR) $(PIXMAN_ARFLAGS) -OUT:$@ $^
.PHONY: all informMMX informSSE2

10
test/Makefile.win32
View File

@@ -16,9 +16,9 @@ OBJECTS = $(patsubst %.c, $(CFG_VAR)/%.obj, $(SOURCES))
TESTS = $(patsubst %, $(CFG_VAR)/%.exe, $(TESTPROGRAMS)) TESTS = $(patsubst %, $(CFG_VAR)/%.exe, $(TESTPROGRAMS))
BENCHS = $(patsubst %, $(CFG_VAR)/%.exe, $(BENCHMARKS)) BENCHS = $(patsubst %, $(CFG_VAR)/%.exe, $(BENCHMARKS))
all: inform $(TESTS) $(BENCHS) all: pixman inform $(TESTS) $(BENCHS)
check: inform $(TESTS) check: pixman inform $(TESTS)
@failures=0 ; \ @failures=0 ; \
total=0 ; \ total=0 ; \
for test in $(TESTS) ; \ for test in $(TESTS) ; \
@@ -46,5 +46,9 @@ $(CFG_VAR)/libutils.lib: $(libutils_OBJECTS)
$(CFG_VAR)/%.exe: $(CFG_VAR)/%.obj $(TEST_LDADD) $(CFG_VAR)/%.exe: $(CFG_VAR)/%.obj $(TEST_LDADD)
@$(LD) $(PIXMAN_LDFLAGS) -OUT:$@ $^ @$(LD) $(PIXMAN_LDFLAGS) -OUT:$@ $^
$(top_builddir)/pixman/$(CFG_VAR)/$(LIBRARY).lib: $(top_builddir)/pixman/$(CFG_VAR)/$(LIBRARY).lib: pixman
pixman:
@$(MAKE) -C $(top_builddir)/pixman -f Makefile.win32 @$(MAKE) -C $(top_builddir)/pixman -f Makefile.win32
.PHONY: all check pixman