[cairo-commit] 2 commits - build/Makefile.win32.common Makefile.win32 src/Makefile.am.analysis

Behdad Esfahbod behdad at kemper.freedesktop.org
Tue Sep 23 01:15:44 PDT 2008


 Makefile.win32              |    3 +++
 build/Makefile.win32.common |    3 +++
 src/Makefile.am.analysis    |   14 +++++++-------
 3 files changed, 13 insertions(+), 7 deletions(-)

New commits:
commit 5a3f03623c7ac0414bafc490c927e1f2282839d1
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Sep 23 04:11:48 2008 -0400

    [Makefile.win32] Add comments about where to edit for customization

diff --git a/Makefile.win32 b/Makefile.win32
index b527fcf..a7e2205 100644
--- a/Makefile.win32
+++ b/Makefile.win32
@@ -1,3 +1,6 @@
+# Do not edit this file.
+# Edit build/Makefile.win32.common for customization
+
 top_srcdir = .
 include $(top_srcdir)/build/Makefile.win32.common
 include $(top_srcdir)/build/Makefile.win32.features-h
diff --git a/build/Makefile.win32.common b/build/Makefile.win32.common
index 711a56f..d00f554 100644
--- a/build/Makefile.win32.common
+++ b/build/Makefile.win32.common
@@ -1,5 +1,8 @@
 default: all
 
+#
+# Edit build/Makefile.win32.features to enable features to build
+#
 include $(top_srcdir)/build/Makefile.win32.features
 
 ifeq ($(top_builddir),)
commit afb32c7f076dbbe4c965fc02226208596f41f59e
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Sep 23 03:52:43 2008 -0400

    [src/Makefile.am.analysis] Fix out-of-tree build

diff --git a/src/Makefile.am.analysis b/src/Makefile.am.analysis
index 108c50e..8508fbf 100644
--- a/src/Makefile.am.analysis
+++ b/src/Makefile.am.analysis
@@ -3,28 +3,28 @@ SPARSE = sparse
 sparse:
 	@echo Checking enabled sources with sparse checker
 	@status=true; for f in $(enabled_cairo_sources); do \
-		echo $(SPARSE) $(PREPROCESS_ARGS) $$f; \
-		$(SPARSE) $(PREPROCESS_ARGS) $$f || status=false; \
+		echo $(SPARSE) $(PREPROCESS_ARGS) $(srcdir)/$$f; \
+		$(SPARSE) $(PREPROCESS_ARGS) $(srcdir)/$$f || status=false; \
 	done; $$status
 
 SPLINT = splint -badflag
 splint:
 	@echo Checking enabled sources with splint checker
 	@status=true; for f in $(enabled_cairo_sources); do \
-		echo $(SPLINT) $(PREPROCESS_ARGS) $$f; \
-		$(SPLINT) $(PREPROCESS_ARGS) $$f || status=false; \
+		echo $(SPLINT) $(PREPROCESS_ARGS) $(srcdir)/$$f; \
+		$(SPLINT) $(PREPROCESS_ARGS) $(srcdir)/$$f || status=false; \
 	done; $$status
 
 UNO = uno
 uno:
 	@echo Checking enabled sources with uno checker
-	$(UNO) $(PREPROCESS_ARGS) -DHAVE_CONFIG_H -U__GNUC__ $(enabled_cairo_sources)
+	cd $(srcdir); $(UNO) $(PREPROCESS_ARGS) -DHAVE_CONFIG_H -U__GNUC__ $(enabled_cairo_sources)
 
 headers-standalone:
 	@echo Checking that enabled public/private headers can be compiled standalone
 	@status=true; for f in $(enabled_cairo_headers) $(enabled_cairo_private); do \
-		echo $(COMPILE) -o /dev/null $$f; \
-		$(COMPILE) -o /dev/null $$f || status=false; \
+		echo $(COMPILE) -o /dev/null $(srcdir)/$$f; \
+		$(COMPILE) -o /dev/null $(srcdir)/$$f || status=false; \
 	done; $$status
 
 analysis: all headers-standalone sparse splint uno


More information about the cairo-commit mailing list