[GTK] Move libLevelDB.la setup into a separate GNUmakefile.am

https://bugs.webkit.org/show_bug.cgi?id=112947

Reviewed by Martin Robinson.

.:

* GNUmakefile.am: Include the new GNUmakefile.am, located under Source/ThirdParty/leveldb.

Source/ThirdParty:

* leveldb/GNUmakefile.am: Added, sets up the libLevelDB.la library.

Source/WebCore:

No new tests - no new functionality.

* GNUmakefile.am: Move the libLevelDD.la setup into the new GNUmakefile.am that's placed in
the third-party leveldb source directory.
* GNUmakefile.list.am: Move the LevelDB sources listing there as well.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@146498 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 4baa44608627598e9a2153a652038b8aa7acd956..59885428db26249342b58394f7a8dc1758553460 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2013-03-21  Zan Dobersek  <zdobersek@igalia.com>
+
+        [GTK] Move libLevelDB.la setup into a separate GNUmakefile.am
+        https://bugs.webkit.org/show_bug.cgi?id=112947
+
+        Reviewed by Martin Robinson.
+
+        * GNUmakefile.am: Include the new GNUmakefile.am, located under Source/ThirdParty/leveldb.
+
 2013-03-21  Martin Robinson  <mrobinson@igalia.com>
 
         Source/ThirdParty/leveldb/db/builder.cc does not build on systems without <endian.h>

diff --git a/GNUmakefile.am b/GNUmakefile.am
index 0c9a131abdc2afb3983cb82b2b63fd02585e73f6..228b825f4edbb1af0ee82fd37324e4e0b5540d48 100644 (file)
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -191,6 +191,7 @@ include Tools/MiniBrowser/gtk/GNUmakefile.am
 include Tools/WebKitTestRunner/GNUmakefile.am
 include Source/ThirdParty/ANGLE/GNUmakefile.am
 include Source/ThirdParty/gtest/GNUmakefile.am
+include Source/ThirdParty/leveldb/GNUmakefile.am
 include Tools/TestWebKitAPI/GNUmakefile.am
 # [GTK] Refactor the translations now that we have webkit2
 # https://bugs.webkit.org/show_bug.cgi?id=55153

diff --git a/Source/ThirdParty/ChangeLog b/Source/ThirdParty/ChangeLog
index 77be86033f64082fd82fa7d8fecc97fd4b1e3447..5e60564e7d4d85208270502cfc582d897e6b79ba 100644 (file)
--- a/Source/ThirdParty/ChangeLog
+++ b/Source/ThirdParty/ChangeLog
@@ -1,3 +1,12 @@
+2013-03-21  Zan Dobersek  <zdobersek@igalia.com>
+
+        [GTK] Move libLevelDB.la setup into a separate GNUmakefile.am
+        https://bugs.webkit.org/show_bug.cgi?id=112947
+
+        Reviewed by Martin Robinson.
+
+        * leveldb/GNUmakefile.am: Added, sets up the libLevelDB.la library.
+
 2013-03-20  Brent Fulgham  <bfulgham@webkit.org>
 
         [WinCairo] Build WinCairo port under VS2010.

diff --git a/Source/ThirdParty/leveldb/GNUmakefile.am b/Source/ThirdParty/leveldb/GNUmakefile.am
new file mode 100644 (file)
index 0000000..c284cc8
--- /dev/null
+++ b/Source/ThirdParty/leveldb/GNUmakefile.am
@@ -0,0 +1,128 @@
+if ENABLE_INDEXED_DATABASE
+noinst_LTLIBRARIES += \
+       libLevelDB.la
+endif
+
+libLevelDB_la_CXXFLAGS = $(global_cxxflags)
+libLevelDB_la_CFLAGS = $(global_cflags)
+libLevelDB_la_CPPFLAGS = \
+       $(global_cppflags) \
+       -fno-builtin-memcmp \
+       -I$(srcdir)/Source/ThirdParty/leveldb \
+       -I$(srcdir)/Source/ThirdParty/leveldb/include \
+       -DLEVELDB_PLATFORM_POSIX
+
+if OS_WIN32
+libLevelDB_la_CPPFLAGS += \
+       -DOS_WIN
+else
+libLevelDB_la_CPPFLAGS += \
+       -pthread
+endif
+
+if OS_LINUX
+libLevelDB_la_CPPFLAGS += \
+       -DOS_LINUX
+endif
+
+if OS_FREEBSD
+libLevelDB_la_CPPFLAGS += \
+       -DOS_FREEBSD
+endif
+
+if OS_DARWIN
+libLevelDB_la_CPPFLAGS += \
+       -DOS_MACOSX
+endif
+
+libLevelDB_la_SOURCES = \
+       Source/ThirdParty/leveldb/db/builder.cc\
+       Source/ThirdParty/leveldb/db/builder.h \
+       Source/ThirdParty/leveldb/db/c.cc \
+       Source/ThirdParty/leveldb/db/dbformat.cc \
+       Source/ThirdParty/leveldb/db/dbformat.h \
+       Source/ThirdParty/leveldb/db/db_impl.cc \
+       Source/ThirdParty/leveldb/db/db_impl.h \
+       Source/ThirdParty/leveldb/db/db_iter.cc \
+       Source/ThirdParty/leveldb/db/db_iter.h \
+       Source/ThirdParty/leveldb/db/filename.cc \
+       Source/ThirdParty/leveldb/db/filename.h \
+       Source/ThirdParty/leveldb/db/log_format.h \
+       Source/ThirdParty/leveldb/db/log_reader.cc \
+       Source/ThirdParty/leveldb/db/log_reader.h \
+       Source/ThirdParty/leveldb/db/log_writer.cc \
+       Source/ThirdParty/leveldb/db/log_writer.h \
+       Source/ThirdParty/leveldb/db/memtable.cc \
+       Source/ThirdParty/leveldb/db/memtable.h \
+       Source/ThirdParty/leveldb/db/repair.cc \
+       Source/ThirdParty/leveldb/db/skiplist.h \
+       Source/ThirdParty/leveldb/db/snapshot.h \
+       Source/ThirdParty/leveldb/db/table_cache.cc \
+       Source/ThirdParty/leveldb/db/table_cache.h \
+       Source/ThirdParty/leveldb/db/version_edit.cc \
+       Source/ThirdParty/leveldb/db/version_edit.h \
+       Source/ThirdParty/leveldb/db/version_set.cc \
+       Source/ThirdParty/leveldb/db/version_set.h \
+       Source/ThirdParty/leveldb/db/write_batch.cc \
+       Source/ThirdParty/leveldb/db/write_batch_internal.h \
+       Source/ThirdParty/leveldb/helpers/memenv/memenv.cc \
+       Source/ThirdParty/leveldb/helpers/memenv/memenv.h \
+       Source/ThirdParty/leveldb/include/leveldb/cache.h \
+       Source/ThirdParty/leveldb/include/leveldb/c.h \
+       Source/ThirdParty/leveldb/include/leveldb/comparator.h \
+       Source/ThirdParty/leveldb/include/leveldb/db.h \
+       Source/ThirdParty/leveldb/include/leveldb/env.h \
+       Source/ThirdParty/leveldb/include/leveldb/filter_policy.h \
+       Source/ThirdParty/leveldb/include/leveldb/iterator.h \
+       Source/ThirdParty/leveldb/include/leveldb/options.h \
+       Source/ThirdParty/leveldb/include/leveldb/slice.h \
+       Source/ThirdParty/leveldb/include/leveldb/status.h \
+       Source/ThirdParty/leveldb/include/leveldb/table_builder.h \
+       Source/ThirdParty/leveldb/include/leveldb/table.h \
+       Source/ThirdParty/leveldb/include/leveldb/write_batch.h \
+       Source/ThirdParty/leveldb/port/atomic_pointer.h \
+       Source/ThirdParty/leveldb/port/port_example.h \
+       Source/ThirdParty/leveldb/port/port.h \
+       Source/ThirdParty/leveldb/port/port_posix.cc \
+       Source/ThirdParty/leveldb/port/port_posix.h \
+       Source/ThirdParty/leveldb/port/thread_annotations.h \
+       Source/ThirdParty/leveldb/port/win/stdint.h \
+       Source/ThirdParty/leveldb/table/block_builder.cc \
+       Source/ThirdParty/leveldb/table/block_builder.h \
+       Source/ThirdParty/leveldb/table/block.cc \
+       Source/ThirdParty/leveldb/table/block.h \
+       Source/ThirdParty/leveldb/table/filter_block.cc \
+       Source/ThirdParty/leveldb/table/filter_block.h \
+       Source/ThirdParty/leveldb/table/format.cc \
+       Source/ThirdParty/leveldb/table/format.h \
+       Source/ThirdParty/leveldb/table/iterator.cc \
+       Source/ThirdParty/leveldb/table/iterator_wrapper.h \
+       Source/ThirdParty/leveldb/table/merger.cc \
+       Source/ThirdParty/leveldb/table/merger.h \
+       Source/ThirdParty/leveldb/table/table_builder.cc \
+       Source/ThirdParty/leveldb/table/table.cc \
+       Source/ThirdParty/leveldb/table/two_level_iterator.cc \
+       Source/ThirdParty/leveldb/table/two_level_iterator.h \
+       Source/ThirdParty/leveldb/util/arena.cc \
+       Source/ThirdParty/leveldb/util/arena.h \
+       Source/ThirdParty/leveldb/util/bloom.cc \
+       Source/ThirdParty/leveldb/util/cache.cc \
+       Source/ThirdParty/leveldb/util/coding.cc \
+       Source/ThirdParty/leveldb/util/coding.h \
+       Source/ThirdParty/leveldb/util/comparator.cc \
+       Source/ThirdParty/leveldb/util/crc32c.cc \
+       Source/ThirdParty/leveldb/util/crc32c.h \
+       Source/ThirdParty/leveldb/util/env.cc \
+       Source/ThirdParty/leveldb/util/env_posix.cc \
+       Source/ThirdParty/leveldb/util/filter_policy.cc \
+       Source/ThirdParty/leveldb/util/hash.cc \
+       Source/ThirdParty/leveldb/util/hash.h \
+       Source/ThirdParty/leveldb/util/histogram.cc \
+       Source/ThirdParty/leveldb/util/histogram.h \
+       Source/ThirdParty/leveldb/util/logging.cc \
+       Source/ThirdParty/leveldb/util/logging.h \
+       Source/ThirdParty/leveldb/util/mutexlock.h \
+       Source/ThirdParty/leveldb/util/options.cc \
+       Source/ThirdParty/leveldb/util/posix_logger.h \
+       Source/ThirdParty/leveldb/util/random.h \
+       Source/ThirdParty/leveldb/util/status.cc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index f775787523fe7de40f350d0ea98ce81faf86bf15..09858746524dbcf112db9a8c4b802f863860b205 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2013-03-21  Zan Dobersek  <zdobersek@igalia.com>
+
+        [GTK] Move libLevelDB.la setup into a separate GNUmakefile.am
+        https://bugs.webkit.org/show_bug.cgi?id=112947
+
+        Reviewed by Martin Robinson.
+
+        No new tests - no new functionality.
+
+        * GNUmakefile.am: Move the libLevelDD.la setup into the new GNUmakefile.am that's placed in
+        the third-party leveldb source directory.
+        * GNUmakefile.list.am: Move the LevelDB sources listing there as well.
+
 2013-03-21  Alberto Garcia  <agarcia@igalia.com>
 
         [BlackBerry] DrawingBuffer: add clearPlatformLayer() implementation

diff --git a/Source/WebCore/GNUmakefile.am b/Source/WebCore/GNUmakefile.am
index 3c28733ae568437be5e7e35895dbc648e6f21d83..4ec826f502239f583118b707b19f5b553bd626ea 100644 (file)
--- a/Source/WebCore/GNUmakefile.am
+++ b/Source/WebCore/GNUmakefile.am
@@ -430,11 +430,6 @@ noinst_LTLIBRARIES += \
        libWebCoreModules.la \
        libWebCore.la
 
-if ENABLE_INDEXED_DATABASE
-noinst_LTLIBRARIES += \
-       libLevelDB.la
-endif
-
 if ENABLE_SVG
 noinst_LTLIBRARIES += \
        libWebCoreSVG.la
@@ -510,38 +505,6 @@ libWebCoreModules_la_CXXFLAGS = $(libWebCore_la_CXXFLAGS)
 libWebCoreModules_la_CFLAGS = $(libWebCore_la_CFLAGS)
 libWebCoreModules_la_CPPFLAGS = $(libWebCore_la_CPPFLAGS)
 
-libLevelDB_la_CXXFLAGS = $(global_cxxflags)
-libLevelDB_la_CFLAGS = $(global_cflags)
-libLevelDB_la_CPPFLAGS = \
-       $(global_cppflags) \
-       -fno-builtin-memcmp \
-       -I$(srcdir)/Source/ThirdParty/leveldb \
-       -I$(srcdir)/Source/ThirdParty/leveldb/include \
-       -DLEVELDB_PLATFORM_POSIX
-
-if OS_WIN32
-libLevelDB_la_CPPFLAGS += \
-       -DOS_WIN
-else
-libLevelDB_la_CPPFLAGS += \
-       -pthread
-endif
-
-if OS_LINUX
-libLevelDB_la_CPPFLAGS += \
-       -DOS_LINUX
-endif
-
-if OS_FREEBSD
-libLevelDB_la_CPPFLAGS += \
-       -DOS_FREEBSD
-endif
-
-if OS_DARWIN
-libLevelDB_la_CPPFLAGS += \
-       -DOS_MACOSX
-endif
-
 libWebCorePlatform_la_SOURCES = \
        $(webcore_platform_sources)
 libWebCorePlatform_la_CXXFLAGS = \

diff --git a/Source/WebCore/GNUmakefile.list.am b/Source/WebCore/GNUmakefile.list.am
index 0e733ca8d2b23d8dfded574922c2a058453f915c..aa002badac5a4b767e696534767c8b3b3386302c 100644 (file)
--- a/Source/WebCore/GNUmakefile.list.am
+++ b/Source/WebCore/GNUmakefile.list.am
@@ -6439,95 +6439,3 @@ webcore_sources += \
        Source/WebCore/platform/graphics/texmap/TextureMapperTiledBackingStore.h
 endif  # END USE_TEXTURE_MAPPER_GL
 endif  # USE_ACCELERATED_COMPOSITING
-
-libLevelDB_la_SOURCES = \
-       Source/ThirdParty/leveldb/db/builder.cc\
-       Source/ThirdParty/leveldb/db/builder.h \
-       Source/ThirdParty/leveldb/db/c.cc \
-       Source/ThirdParty/leveldb/db/dbformat.cc \
-       Source/ThirdParty/leveldb/db/dbformat.h \
-       Source/ThirdParty/leveldb/db/db_impl.cc \
-       Source/ThirdParty/leveldb/db/db_impl.h \
-       Source/ThirdParty/leveldb/db/db_iter.cc \
-       Source/ThirdParty/leveldb/db/db_iter.h \
-       Source/ThirdParty/leveldb/db/filename.cc \
-       Source/ThirdParty/leveldb/db/filename.h \
-       Source/ThirdParty/leveldb/db/log_format.h \
-       Source/ThirdParty/leveldb/db/log_reader.cc \
-       Source/ThirdParty/leveldb/db/log_reader.h \
-       Source/ThirdParty/leveldb/db/log_writer.cc \
-       Source/ThirdParty/leveldb/db/log_writer.h \
-       Source/ThirdParty/leveldb/db/memtable.cc \
-       Source/ThirdParty/leveldb/db/memtable.h \
-       Source/ThirdParty/leveldb/db/repair.cc \
-       Source/ThirdParty/leveldb/db/skiplist.h \
-       Source/ThirdParty/leveldb/db/snapshot.h \
-       Source/ThirdParty/leveldb/db/table_cache.cc \
-       Source/ThirdParty/leveldb/db/table_cache.h \
-       Source/ThirdParty/leveldb/db/version_edit.cc \
-       Source/ThirdParty/leveldb/db/version_edit.h \
-       Source/ThirdParty/leveldb/db/version_set.cc \
-       Source/ThirdParty/leveldb/db/version_set.h \
-       Source/ThirdParty/leveldb/db/write_batch.cc \
-       Source/ThirdParty/leveldb/db/write_batch_internal.h \
-       Source/ThirdParty/leveldb/helpers/memenv/memenv.cc \
-       Source/ThirdParty/leveldb/helpers/memenv/memenv.h \
-       Source/ThirdParty/leveldb/include/leveldb/cache.h \
-       Source/ThirdParty/leveldb/include/leveldb/c.h \
-       Source/ThirdParty/leveldb/include/leveldb/comparator.h \
-       Source/ThirdParty/leveldb/include/leveldb/db.h \
-       Source/ThirdParty/leveldb/include/leveldb/env.h \
-       Source/ThirdParty/leveldb/include/leveldb/filter_policy.h \
-       Source/ThirdParty/leveldb/include/leveldb/iterator.h \
-       Source/ThirdParty/leveldb/include/leveldb/options.h \
-       Source/ThirdParty/leveldb/include/leveldb/slice.h \
-       Source/ThirdParty/leveldb/include/leveldb/status.h \
-       Source/ThirdParty/leveldb/include/leveldb/table_builder.h \
-       Source/ThirdParty/leveldb/include/leveldb/table.h \
-       Source/ThirdParty/leveldb/include/leveldb/write_batch.h \
-       Source/ThirdParty/leveldb/port/atomic_pointer.h \
-       Source/ThirdParty/leveldb/port/port_example.h \
-       Source/ThirdParty/leveldb/port/port.h \
-       Source/ThirdParty/leveldb/port/port_posix.cc \
-       Source/ThirdParty/leveldb/port/port_posix.h \
-       Source/ThirdParty/leveldb/port/thread_annotations.h \
-       Source/ThirdParty/leveldb/port/win/stdint.h \
-       Source/ThirdParty/leveldb/table/block_builder.cc \
-       Source/ThirdParty/leveldb/table/block_builder.h \
-       Source/ThirdParty/leveldb/table/block.cc \
-       Source/ThirdParty/leveldb/table/block.h \
-       Source/ThirdParty/leveldb/table/filter_block.cc \
-       Source/ThirdParty/leveldb/table/filter_block.h \
-       Source/ThirdParty/leveldb/table/format.cc \
-       Source/ThirdParty/leveldb/table/format.h \
-       Source/ThirdParty/leveldb/table/iterator.cc \
-       Source/ThirdParty/leveldb/table/iterator_wrapper.h \
-       Source/ThirdParty/leveldb/table/merger.cc \
-       Source/ThirdParty/leveldb/table/merger.h \
-       Source/ThirdParty/leveldb/table/table_builder.cc \
-       Source/ThirdParty/leveldb/table/table.cc \
-       Source/ThirdParty/leveldb/table/two_level_iterator.cc \
-       Source/ThirdParty/leveldb/table/two_level_iterator.h \
-       Source/ThirdParty/leveldb/util/arena.cc \
-       Source/ThirdParty/leveldb/util/arena.h \
-       Source/ThirdParty/leveldb/util/bloom.cc \
-       Source/ThirdParty/leveldb/util/cache.cc \
-       Source/ThirdParty/leveldb/util/coding.cc \
-       Source/ThirdParty/leveldb/util/coding.h \
-       Source/ThirdParty/leveldb/util/comparator.cc \
-       Source/ThirdParty/leveldb/util/crc32c.cc \
-       Source/ThirdParty/leveldb/util/crc32c.h \
-       Source/ThirdParty/leveldb/util/env.cc \
-       Source/ThirdParty/leveldb/util/env_posix.cc \
-       Source/ThirdParty/leveldb/util/filter_policy.cc \
-       Source/ThirdParty/leveldb/util/hash.cc \
-       Source/ThirdParty/leveldb/util/hash.h \
-       Source/ThirdParty/leveldb/util/histogram.cc \
-       Source/ThirdParty/leveldb/util/histogram.h \
-       Source/ThirdParty/leveldb/util/logging.cc \
-       Source/ThirdParty/leveldb/util/logging.h \
-       Source/ThirdParty/leveldb/util/mutexlock.h \
-       Source/ThirdParty/leveldb/util/options.cc \
-       Source/ThirdParty/leveldb/util/posix_logger.h \
-       Source/ThirdParty/leveldb/util/random.h \
-       Source/ThirdParty/leveldb/util/status.cc