Alternate approach to enabling PDF in gm (gyp changes)

http://codereview.appspot.com/4631067



git-svn-id: http://skia.googlecode.com/svn/trunk@1713 2bbb7eff-a529-9590-31e7-b0007b416f81

3 files changed, 7 insertions, 34 deletions

diff --git a/gyp/gm.gyp b/gyp/gm.gyp
index bc006cb48e..10b85928b2 100644
--- a/gyp/gm.gyp
+++ b/gyp/gm.gyp
@@ -1,11 +1,4 @@
 # GYP file to build the "gm" (golden master) executable.
-#
-# To build and run on Linux:
-#  ./gyp_skia gm.gyp && make
-#  out/Debug/gm -r ../gm/base-linux
-#
-# Building on other platforms not tested yet.
-#
 {
   'includes': [
     'apptype_console.gypi',
@@ -40,6 +33,7 @@
         'gpu.gyp:gr',
         'gpu.gyp:skgr',
         'images.gyp:images',
+        'pdf.gyp:pdf',
         'utils.gyp:utils',
       ],
     },
diff --git a/gyp/pdf.gyp b/gyp/pdf.gyp
index 1ad3e05712..59aba08c77 100644
--- a/gyp/pdf.gyp
+++ b/gyp/pdf.gyp
@@ -39,7 +39,12 @@
         '../src/pdf/SkPDFTypes.cpp',
         '../src/pdf/SkPDFUtils.cpp',
       ],
+      # This section makes all targets that depend on this target
+      # #define SK_SUPPORT_PDF and have access to the pdf header files.
       'direct_dependent_settings': {
+        'defines': [
+          'SK_SUPPORT_PDF',
+        ],
         'include_dirs': [
           '../include/pdf',
         ],
diff --git a/gyp/tests.gyp b/gyp/tests.gyp
index b44c97793c..d78a65a631 100644
--- a/gyp/tests.gyp
+++ b/gyp/tests.gyp
@@ -1,28 +1,14 @@
 # GYP file to build unit tests.
-#
-# To build and run on Linux:
-#  ./gyp_skia tests.gyp && make
-#  out/Debug/tests
-#
-# To build on Linux with skia_pdf_support disabled:
-#  ./gyp_skia tests.gyp -Dskia_pdf_support=false && make
-#
-# Building on other platforms not tested yet.
-#
 {
   'includes': [
     'apptype_console.gypi',
     'target_defaults.gypi',
   ],
-  'variables': {
-    'skia_pdf_support%': 'true',
-  },
   'targets': [
     {
       'target_name': 'tests',
       'type': 'executable',
       'include_dirs' : [
-        '../include/pdf',
         '../src/core',
       ],
       'sources': [
@@ -74,21 +60,9 @@
         'effects.gyp:effects',
         'experimental.gyp:experimental',
         'images.gyp:images',
+        'pdf.gyp:pdf',
         'utils.gyp:utils',
       ],
-      'conditions': [
-        [ 'skia_pdf_support == "true"',
-          { # if skia_pdf_support is TRUE, depend on pdf.gyp...
-            'dependencies': [
-              'pdf.gyp:pdf',
-            ],
-          }, { # else, we don't need PDFPrimitivesTest.cpp after all.
-            'sources!': [
-              '../tests/PDFPrimitivesTest.cpp',
-            ],
-          }
-        ],
-      ],
     },
   ],
 }