aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorvandebo@chromium.org <vandebo@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-03-08 18:33:31 +0000
committervandebo@chromium.org <vandebo@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-03-08 18:33:31 +0000
commit5b073680ecba631da68e33d0d2f28f10a07110ce (patch)
tree807279828d4ab6ace6186260fafacfdf9b743ba3 /Makefile
parentda912d61ede86dd3dfa8f645c6f3977f2183812b (diff)
downloadskia-5b073680ecba631da68e33d0d2f28f10a07110ce.tar.gz
Enable compiling the PDF backend by default in the makefile.
Use SKIA_PDF_SUPPORT=false to disable the PDF backend. Review URL: http://codereview.appspot.com/4267046 git-svn-id: http://skia.googlecode.com/svn/trunk@906 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile19
1 files changed, 4 insertions, 15 deletions
diff --git a/Makefile b/Makefile
index c3354ff66d..e482060c62 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ endif
DEFINES += -DSK_SUPPORT_LCDTEXT
-ifeq ($(SKIA_PDF_SUPPORT),true)
+ifneq ($(SKIA_PDF_SUPPORT),false)
DEFINES += -DSK_SUPPORT_PDF
ifneq ($(SKIA_DEBUG),true)
DEFINES += -DSK_ZLIB_INCLUDE="<zlib.h>"
@@ -69,7 +69,7 @@ include src/gpu/skgr_files.mk
SRC_LIST += $(addprefix src/gpu/, $(SOURCE))
# pdf backend files
-ifeq ($(SKIA_PDF_SUPPORT),true)
+ifneq ($(SKIA_PDF_SUPPORT),false)
C_INCLUDES += -Iinclude/pdf
include src/pdf/pdf_files.mk
SRC_LIST += $(addprefix src/pdf/, $(SOURCE))
@@ -176,7 +176,7 @@ bench: $(BENCH_OBJS) out/libskia.a
C_INCLUDES += -Isrc/core
include tests/tests_files.mk
-ifeq ($(SKIA_PDF_SUPPORT),true)
+ifneq ($(SKIA_PDF_SUPPORT),false)
SOURCE += PDFPrimitivesTest.cpp
endif
TESTS_SRCS := $(addprefix tests/, $(SOURCE))
@@ -230,17 +230,6 @@ gm: $(GM_OBJS) out/libskia.a
@echo "linking gm..."
$(HIDE)$(GPP) $(GM_OBJS) out/libskia.a -o out/gm/gm $(LINKER_OPTS)
-SAMPLEPDF_SRCS := samplepdf.cpp
-
-SAMPLEPDF_SRCS := $(addprefix tools/, $(SAMPLEPDF_SRCS))
-
-SAMPLEPDF_OBJS := $(SAMPLEPDF_SRCS:.cpp=.o)
-SAMPLEPDF_OBJS := $(addprefix out/, $(SAMPLEPDF_OBJS))
-
-samplepdf: $(SAMPLEPDF_OBJS) out/libskia.a
- @echo "linking samplepdf..."
- $(HIDE)$(GPP) $(SAMPLEPDF_OBJS) out/libskia.a -o out/tools/samplepdf $(LINKER_OPTS)
-
##############################################################################
.PHONY: all
@@ -265,5 +254,5 @@ help:
@echo " SKIA_DEBUG=true for debug build"
@echo " SKIA_SCALAR=fixed for fixed-point build"
@echo " SKIA_BUILD_FOR=mac for mac build (e.g. CG for image decoding)"
- @echo " SKIA_PDF_SUPPORT=true to enable the pdf generation backend"
+ @echo " SKIA_PDF_SUPPORT=false to disable the pdf generation backend"
@echo ""