5 files changed, 20 insertions, 20 deletions
diff --git a/boilerplate/Makefile.win32 b/boilerplate/Makefile.win32
index 46aa0b6fb..29df5cf79 100644
--- a/boilerplate/Makefile.win32
+++ b/boilerplate/Makefile.win32
@@ -2,8 +2,6 @@ top_srcdir = ..
 include $(top_srcdir)/build/Makefile.win32.common
 include Makefile.win32.features
 
-CFLAGS += -I../src
-
 HEADERS = \
 	$(enabled_cairo_boilerplate_headers) \
 	$(enabled_cairo_boilerplate_private) \
@@ -23,4 +21,4 @@ all: $(CFG)/boiler.lib
 
 
 $(CFG)/boiler.lib: $(OBJECTS)
-	lib -NOLOGO -OUT:$@ $(OBJECTS) $(WIN_LIBS)
+	@$(AR) $(CAIRO_ARFLAGS) -OUT:$@ $(OBJECTS)
diff --git a/build/Makefile.win32.common b/build/Makefile.win32.common
index 5ff07809e..e42250063 100644
--- a/build/Makefile.win32.common
+++ b/build/Makefile.win32.common
@@ -11,16 +11,15 @@ top_builddir = $(top_srcdir)
 endif
 
 CC := cl
-LINK := link
+LD := link
+AR := lib
 
 ifeq ($(CFG),debug)
-MS_MDFLAGS := -MDd
-MS_LDFLAGS := -LDd
-OPT := -Od -Zi
+CFG_CFLAGS := -MDd -Od -Zi
+CFG_LDFLAGS := -DEBUG
 else
-MS_MDFLAGS := -MD
-MS_LDFLAGS := -LD
-OPT := -MD -O2
+CFG_CFLAGS := -MD -O2
+CFG_LDFLAGS :=
 endif
 
 PIXMAN_CFLAGS := -I$(top_srcdir)/../pixman/pixman
@@ -37,13 +36,18 @@ ZLIB_CFLAGS += -I$(top_srcdir)/../zlib/
 CAIRO_LIBS += $(top_builddir)/../zlib/zdll.lib
 endif
 
-DEFAULT_CFLAGS = -nologo $(MS_MDFLAGS) $(OPT)
-DEFAULT_CFLAGS += -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
-DEFAULT_CFLAGS += -I. -I$(top_srcdir)
+DEFAULT_CFLAGS = -nologo $(CFG_CFLAGS)
+DEFAULT_CFLAGS += -I. -I$(top_srcdir) -I$(top_srcdir)/src
 DEFAULT_CFLAGS += $(PIXMAN_CFLAGS) $(LIBPNG_CFLAGS) $(ZLIB_CFLAGS)
 
 CAIRO_CFLAGS = $(DEFAULT_CFLAGS) $(CFLAGS)
 
+DEFAULT_LDFLAGS = -nologo $(CFG_LDFLAGS)
+DEFAULT_ARFLAGS = -nologo
+
+CAIRO_LDFLAGS = $(DEFAULT_LDFLAGS) $(LDFLAGS)
+CAIRO_ARFLAGS = $(DEFAULT_ARFLAGS) $(LDFLAGS)
+
 inform:
 	@echo
 ifneq ($(CFG),release)
diff --git a/src/Makefile.win32 b/src/Makefile.win32
index 6fdc39560..864791f37 100644
--- a/src/Makefile.win32
+++ b/src/Makefile.win32
@@ -13,10 +13,10 @@ static: inform $(CFG)/cairo-static.lib
 dynamic: inform $(CFG)/cairo.dll
 
 $(CFG)/cairo.dll: $(OBJECTS)
-	$(CC) $(OPT) $(MS_MDFLAGS) $(MS_LDFLAGS) -Fe$@ $(PIXMAN_LIBS) $(OBJECTS) -link $(CAIRO_LIBS)
+	@$(LD) $(CAIRO_LDFLAGS) -DLL -OUT:$@ $(CAIRO_LIBS) $(PIXMAN_LIBS) $(OBJECTS)
 
 $(CFG)/cairo-static.lib: $(OBJECTS_STATIC)
-	lib -NOLOGO -OUT:$@ $(PIXMAN_LIBS) $(OBJECTS_STATIC)
+	@$(AR) $(CAIRO_ARFLAGS) -OUT:$@ $(PIXMAN_LIBS) $(OBJECTS_STATIC)
 
 all: inform $(CFG)/cairo.dll $(CFG)/cairo-static.lib
 	@echo "Built successfully!"
diff --git a/test/Makefile.win32 b/test/Makefile.win32
index ff5e2661d..cd08db867 100644
--- a/test/Makefile.win32
+++ b/test/Makefile.win32
@@ -2,7 +2,7 @@ top_srcdir = ..
 include $(top_srcdir)/build/Makefile.win32.common
 include $(top_srcdir)/test/Makefile.sources
 
-CFLAGS += -I../src -I../boilerplate -I./pdiff
+CFLAGS += -I$(top_srcdir)/boilerplate -I./pdiff
 
 TEST_LIBS = ./pdiff/$(CFG)/pdiff.lib $(top_srcdir)/src/$(CFG)/cairo-static.lib $(top_srcdir)/boilerplate/$(CFG)/boiler.lib
 
@@ -16,7 +16,7 @@ SOURCES = $(cairo_test_suite_sources) $(test_sources) cairo-test-constructors.c
 OBJECTS = $(patsubst %.c, $(CFG)/%-static.obj, $(SOURCES))
 
 cairo-test-suite.exe: $(OBJECTS) $(TEST_LIBS)
-	$(CC) $(OPT) $(MS_MDFLAGS) $(OBJECTS) -Fe"$@" -link $(LDFLAGS) $(TEST_LIBS) $(CAIRO_LIBS)
+	@$(LD) $(CAIRO_LDFLAGS) -OUT:$@ $(OBJECTS) $(TEST_LIBS) $(CAIRO_LIBS)
 
 ./pdiff/$(CFG)/pdiff.lib:
 	$(MAKE) -C pdiff -f Makefile.win32
diff --git a/test/pdiff/Makefile.win32 b/test/pdiff/Makefile.win32
index f25383e8b..3d64676da 100644
--- a/test/pdiff/Makefile.win32
+++ b/test/pdiff/Makefile.win32
@@ -1,8 +1,6 @@
 top_srcdir = ../..
 include $(top_srcdir)/build/Makefile.win32.common
 
-CFLAGS += -I../../src
-
 SOURCES = \
 	lpyramid.c \
 	pdiff.c \
@@ -13,4 +11,4 @@ OBJECTS = $(patsubst %.c, $(CFG)/%-static.obj, $(SOURCES))
 all: $(CFG)/pdiff.lib
 
 $(CFG)/pdiff.lib: $(OBJECTS)
-	lib -NOLOGO -OUT:$@ $(OBJECTS)
+	@$(AR) $(CAIRO_ARFLAGS) -OUT:$@ $(OBJECTS)