3 files changed, 81 insertions, 77 deletions
diff --git a/third_party/libpng/SConscript b/third_party/libpng/SConscript
deleted file mode 100644
index 5beb689..0000000
--- a/third_party/libpng/SConscript
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# TODO(keunwoo): Use better cross-platform abstraction; see chrome/SConstruct
-Import('env')
-
-env = env.Clone()
-
-env.Prepend(
-    CPPPATH = [
-        '#../third_party/zlib',
-        '#../',
-    ],
-)
-
-if env['PLATFORM'] == 'win32':
-  env.Append(
-      CCFLAGS = [
-          '/TP',
-          '/wd4800',
-      ],
-  )
-
-env.Append(
-    CPPDEFINES = [
-        'PNG_USER_CONFIG',
-        'CHROME_PNG_WRITE_SUPPORT',
-    ],
-)
-
-input_files = [
-    'png.c',
-    'pngwutil.c',
-    'pngwtran.c',
-    'pngwrite.c',
-    'pngwio.c',
-    'pngvcrd.c',
-    'pngtrans.c',
-    'pngset.c',
-    'pngrutil.c',
-    'pngrtran.c',
-    'pngrio.c',
-    'pngread.c',
-    'pngpread.c',
-    'pngmem.c',
-    'pngget.c',
-    'pnggccrd.c',
-    'pngerror.c',
-]
-
-env.ChromeStaticLibrary('libpng', input_files)
diff --git a/third_party/libpng/libpng.scons b/third_party/libpng/libpng.scons
new file mode 100644
index 0000000..7acba1c
--- /dev/null
+++ b/third_party/libpng/libpng.scons
@@ -0,0 +1,59 @@
+# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+
+__doc__ = """
+Configuration for building libpng.lib / libpng.a.
+"""
+
+Import('env')
+
+env = env.Clone()
+
+env.SConscript([
+    '$ZLIB_DIR/using_zlib.scons',
+], {'env':env})
+
+env.Prepend(
+    CPPPATH = [
+        '$ROOT_DIR',
+    ],
+)
+
+if env['PLATFORM'] == 'win32':
+  env.Append(
+      CCFLAGS = [
+          '/TP',
+          '/wd4800',
+      ],
+  )
+
+env.Append(
+    CPPDEFINES = [
+        'PNG_USER_CONFIG',
+        'CHROME_PNG_WRITE_SUPPORT',
+    ],
+)
+
+input_files = [
+    'png.c',
+    'pngwutil.c',
+    'pngwtran.c',
+    'pngwrite.c',
+    'pngwio.c',
+    'pngvcrd.c',
+    'pngtrans.c',
+    'pngset.c',
+    'pngrutil.c',
+    'pngrtran.c',
+    'pngrio.c',
+    'pngread.c',
+    'pngpread.c',
+    'pngmem.c',
+    'pngget.c',
+    'pnggccrd.c',
+    'pngerror.c',
+]
+
+env.ChromeStaticLibrary('libpng', input_files)
diff --git a/third_party/libpng/using_libpng.scons b/third_party/libpng/using_libpng.scons
new file mode 100644
index 0000000..68b9c3f
--- /dev/null
+++ b/third_party/libpng/using_libpng.scons
@@ -0,0 +1,22 @@
+# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+__doc__ = """
+Settings for other components using the libpng library.
+"""
+
+Import("env")
+
+env.Append(
+    CPPPATH = [
+        '$LIBPNG_DIR',
+    ],
+    CPPDEFINES = [
+        'PNG_USER_CONFIG',
+        'CHROME_PNG_WRITE_SUPPORT',
+    ],
+    LIBS = [
+        'libpng',
+    ],
+)