OpenBSD/FreeBSD GYP changes (most of the remaining ones)

Review URL: http://codereview.chromium.org/565043

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38079 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 20 insertions, 18 deletions

diff --git a/printing/native_metafile.h b/printing/native_metafile.h
index 2c71986..b0f957a 100644
--- a/printing/native_metafile.h
+++ b/printing/native_metafile.h
@@ -34,9 +34,9 @@ typedef PdfMetafile NativeMetafile;
 
 }  // namespace printing
 
-#elif defined(OS_LINUX)
+#elif defined(OS_POSIX)
 
-#include "printing/pdf_ps_metafile_linux.h"
+#include "printing/pdf_ps_metafile_cairo.h"
 
 namespace printing {
 
diff --git a/printing/pdf_ps_metafile_linux.cc b/printing/pdf_ps_metafile_cairo.cc
index a3da6ee..db70d08 100644
--- a/printing/pdf_ps_metafile_linux.cc
+++ b/printing/pdf_ps_metafile_cairo.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "printing/pdf_ps_metafile_linux.h"
+#include "printing/pdf_ps_metafile_cairo.h"
 
 #include <stdio.h>
 
diff --git a/printing/pdf_ps_metafile_linux.h b/printing/pdf_ps_metafile_cairo.h
index 6f92b66..1a7bd01 100644
--- a/printing/pdf_ps_metafile_linux.h
+++ b/printing/pdf_ps_metafile_cairo.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PRINTING_PDF_PS_METAFILE_LINUX_H_
-#define PRINTING_PDF_PS_METAFILE_LINUX_H_
+#ifndef PRINTING_PDF_PS_METAFILE_CAIRO_H_
+#define PRINTING_PDF_PS_METAFILE_CAIRO_H_
 
 #include <string>
 
@@ -107,4 +107,4 @@ class PdfPsMetafile {
 
 }  // namespace printing
 
-#endif  // PRINTING_PDF_PS_METAFILE_LINUX_H_
+#endif  // PRINTING_PDF_PS_METAFILE_CAIRO_H_
diff --git a/printing/pdf_ps_metafile_linux_unittest.cc b/printing/pdf_ps_metafile_cairo_unittest.cc
index e852b37..6dfd70a 100644
--- a/printing/pdf_ps_metafile_linux_unittest.cc
+++ b/printing/pdf_ps_metafile_cairo_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "printing/pdf_ps_metafile_linux.h"
+#include "printing/pdf_ps_metafile_cairo.h"
 
 #include <fcntl.h>
 #include <string>
diff --git a/printing/printed_document_linux.cc b/printing/printed_document_cairo.cc
index 8386914..8386914 100644
--- a/printing/printed_document_linux.cc
+++ b/printing/printed_document_cairo.cc
diff --git a/printing/printing.gyp b/printing/printing.gyp
index 3f48ef7..2e255a0 100644
--- a/printing/printing.gyp
+++ b/printing/printing.gyp
@@ -39,12 +39,12 @@
         'page_setup.h',
         'pdf_metafile_mac.h',
         'pdf_metafile_mac.cc',
-        'pdf_ps_metafile_linux.h',
-        'pdf_ps_metafile_linux.cc',
+        'pdf_ps_metafile_cairo.h',
+        'pdf_ps_metafile_cairo.cc',
         'print_settings.cc',
         'print_settings.h',
         'printed_document.cc',
-        'printed_document_linux.cc',
+        'printed_document_cairo.cc',
         'printed_document_mac.cc',
         'printed_document_win.cc',
         'printed_document.h',
@@ -52,7 +52,7 @@
         'printed_page.h',
         'printed_pages_source.h',
         'printing_context.h',
-        'printing_context_linux.cc',
+        'printing_context_cairo.cc',
         'printing_context_mac.mm',
         'printing_context_win.cc',
         'units.cc',
@@ -64,13 +64,15 @@
         ],
       },
       'conditions': [
-        ['OS!="linux"', {'sources/': [['exclude', '_linux\\.cc$']]}],
+        ['OS!="linux" and OS!="freebsd" and OS!="openbsd"',{
+            'sources/': [['exclude', '_cairo\\.cc$']]
+        }],
         ['OS!="mac"', {'sources/': [['exclude', '_mac\\.(cc|mm?)$']]}],
         ['OS!="win"', {'sources/': [['exclude', '_win\\.cc$']]
           }, {  # else: OS=="win"
             'sources/': [['exclude', '_posix\\.cc$']]
         }],
-        ['OS=="linux"', {
+        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
           'dependencies': [
             # For FT_Init_FreeType and friends.
             '../build/linux/system.gyp:freetype2',
@@ -94,25 +96,25 @@
         'page_range_unittest.cc',
         'page_setup_unittest.cc',
         'pdf_metafile_mac_unittest.cc',
-        'pdf_ps_metafile_linux_unittest.cc',
+        'pdf_ps_metafile_cairo_unittest.cc',
         'printing_context_win_unittest.cc',
         'run_all_unittests.cc',
         'units_unittest.cc',
       ],
       'conditions': [
-        ['OS!="linux"', {'sources/': [['exclude', '_linux_unittest\\.cc$']]}],
+        ['OS!="linux"', {'sources/': [['exclude', '_cairo_unittest\\.cc$']]}],
         ['OS!="mac"', {'sources/': [['exclude', '_mac_unittest\\.(cc|mm?)$']]}],
         ['OS!="win"', {'sources/': [['exclude', '_win_unittest\\.cc$']]
           }, {  # else: OS=="win"
-            'sources/': [['exclude', '_posix_unittest\\.cc$']]
+            'sources/': [['exclude', '_cairo_unittest\\.cc$']]
           }
         ],
-        ['OS=="linux"', {
+        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
             'dependencies': [
               '../build/linux/system.gyp:gtk',
            ],
         }],
-        ['OS=="linux" or OS=="freebsd"', {
+        ['OS=="linux"', {
           'conditions': [
             ['linux_use_tcmalloc==1', {
               'dependencies': [
diff --git a/printing/printing_context_linux.cc b/printing/printing_context_cairo.cc
index fcc51f7..fcc51f7 100644
--- a/printing/printing_context_linux.cc
+++ b/printing/printing_context_cairo.cc