Changeset 146498 in webkit


Ignore:
Timestamp:
Mar 21, 2013, 12:25:41 PM (12 years ago)
Author:
zandobersek@gmail.com
Message:

[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.
Location:
trunk
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r146468 r146498  
     12013-03-21  Zan Dobersek  <zdobersek@igalia.com>
     2
     3        [GTK] Move libLevelDB.la setup into a separate GNUmakefile.am
     4        https://bugs.webkit.org/show_bug.cgi?id=112947
     5
     6        Reviewed by Martin Robinson.
     7
     8        * GNUmakefile.am: Include the new GNUmakefile.am, located under Source/ThirdParty/leveldb.
     9
    1102013-03-21  Martin Robinson  <mrobinson@igalia.com>
    211

  • trunk/GNUmakefile.am

    r146390 r146498  
    192192include Source/ThirdParty/ANGLE/GNUmakefile.am
    193193include Source/ThirdParty/gtest/GNUmakefile.am
     194include Source/ThirdParty/leveldb/GNUmakefile.am
    194195include Tools/TestWebKitAPI/GNUmakefile.am
    195196# [GTK] Refactor the translations now that we have webkit2

  • trunk/Source/ThirdParty/ChangeLog

    r146422 r146498  
     12013-03-21  Zan Dobersek  <zdobersek@igalia.com>
     2
     3        [GTK] Move libLevelDB.la setup into a separate GNUmakefile.am
     4        https://bugs.webkit.org/show_bug.cgi?id=112947
     5
     6        Reviewed by Martin Robinson.
     7
     8        * leveldb/GNUmakefile.am: Added, sets up the libLevelDB.la library.
     9
    1102013-03-20  Brent Fulgham  <bfulgham@webkit.org>
    211

  • trunk/Source/WebCore/ChangeLog

    r146497 r146498  
     12013-03-21  Zan Dobersek  <zdobersek@igalia.com>
     2
     3        [GTK] Move libLevelDB.la setup into a separate GNUmakefile.am
     4        https://bugs.webkit.org/show_bug.cgi?id=112947
     5
     6        Reviewed by Martin Robinson.
     7
     8        No new tests - no new functionality.
     9
     10        * GNUmakefile.am: Move the libLevelDD.la setup into the new GNUmakefile.am that's placed in
     11        the third-party leveldb source directory.
     12        * GNUmakefile.list.am: Move the LevelDB sources listing there as well.
     13
    1142013-03-21  Alberto Garcia  <agarcia@igalia.com>
    215

  • trunk/Source/WebCore/GNUmakefile.am

    r146468 r146498  
    431431        libWebCore.la
    432432
    433 if ENABLE_INDEXED_DATABASE
    434 noinst_LTLIBRARIES += \
    435         libLevelDB.la
    436 endif
    437 
    438433if ENABLE_SVG
    439434noinst_LTLIBRARIES += \
    … …  
    510505libWebCoreModules_la_CFLAGS = $(libWebCore_la_CFLAGS)
    511506libWebCoreModules_la_CPPFLAGS = $(libWebCore_la_CPPFLAGS)
    512 
    513 libLevelDB_la_CXXFLAGS = $(global_cxxflags)
    514 libLevelDB_la_CFLAGS = $(global_cflags)
    515 libLevelDB_la_CPPFLAGS = \
    516         $(global_cppflags) \
    517         -fno-builtin-memcmp \
    518         -I$(srcdir)/Source/ThirdParty/leveldb \
    519         -I$(srcdir)/Source/ThirdParty/leveldb/include \
    520         -DLEVELDB_PLATFORM_POSIX
    521 
    522 if OS_WIN32
    523 libLevelDB_la_CPPFLAGS += \
    524         -DOS_WIN
    525 else
    526 libLevelDB_la_CPPFLAGS += \
    527         -pthread
    528 endif
    529 
    530 if OS_LINUX
    531 libLevelDB_la_CPPFLAGS += \
    532         -DOS_LINUX
    533 endif
    534 
    535 if OS_FREEBSD
    536 libLevelDB_la_CPPFLAGS += \
    537         -DOS_FREEBSD
    538 endif
    539 
    540 if OS_DARWIN
    541 libLevelDB_la_CPPFLAGS += \
    542         -DOS_MACOSX
    543 endif
    544507
    545508libWebCorePlatform_la_SOURCES = \

  • trunk/Source/WebCore/GNUmakefile.list.am

    r146486 r146498  
    64406440endif  # END USE_TEXTURE_MAPPER_GL
    64416441endif  # USE_ACCELERATED_COMPOSITING
    6442 
    6443 libLevelDB_la_SOURCES = \
    6444         Source/ThirdParty/leveldb/db/builder.cc\
    6445         Source/ThirdParty/leveldb/db/builder.h \
    6446         Source/ThirdParty/leveldb/db/c.cc \
    6447         Source/ThirdParty/leveldb/db/dbformat.cc \
    6448         Source/ThirdParty/leveldb/db/dbformat.h \
    6449         Source/ThirdParty/leveldb/db/db_impl.cc \
    6450         Source/ThirdParty/leveldb/db/db_impl.h \
    6451         Source/ThirdParty/leveldb/db/db_iter.cc \
    6452         Source/ThirdParty/leveldb/db/db_iter.h \
    6453         Source/ThirdParty/leveldb/db/filename.cc \
    6454         Source/ThirdParty/leveldb/db/filename.h \
    6455         Source/ThirdParty/leveldb/db/log_format.h \
    6456         Source/ThirdParty/leveldb/db/log_reader.cc \
    6457         Source/ThirdParty/leveldb/db/log_reader.h \
    6458         Source/ThirdParty/leveldb/db/log_writer.cc \
    6459         Source/ThirdParty/leveldb/db/log_writer.h \
    6460         Source/ThirdParty/leveldb/db/memtable.cc \
    6461         Source/ThirdParty/leveldb/db/memtable.h \
    6462         Source/ThirdParty/leveldb/db/repair.cc \
    6463         Source/ThirdParty/leveldb/db/skiplist.h \
    6464         Source/ThirdParty/leveldb/db/snapshot.h \
    6465         Source/ThirdParty/leveldb/db/table_cache.cc \
    6466         Source/ThirdParty/leveldb/db/table_cache.h \
    6467         Source/ThirdParty/leveldb/db/version_edit.cc \
    6468         Source/ThirdParty/leveldb/db/version_edit.h \
    6469         Source/ThirdParty/leveldb/db/version_set.cc \
    6470         Source/ThirdParty/leveldb/db/version_set.h \
    6471         Source/ThirdParty/leveldb/db/write_batch.cc \
    6472         Source/ThirdParty/leveldb/db/write_batch_internal.h \
    6473         Source/ThirdParty/leveldb/helpers/memenv/memenv.cc \
    6474         Source/ThirdParty/leveldb/helpers/memenv/memenv.h \
    6475         Source/ThirdParty/leveldb/include/leveldb/cache.h \
    6476         Source/ThirdParty/leveldb/include/leveldb/c.h \
    6477         Source/ThirdParty/leveldb/include/leveldb/comparator.h \
    6478         Source/ThirdParty/leveldb/include/leveldb/db.h \
    6479         Source/ThirdParty/leveldb/include/leveldb/env.h \
    6480         Source/ThirdParty/leveldb/include/leveldb/filter_policy.h \
    6481         Source/ThirdParty/leveldb/include/leveldb/iterator.h \
    6482         Source/ThirdParty/leveldb/include/leveldb/options.h \
    6483         Source/ThirdParty/leveldb/include/leveldb/slice.h \
    6484         Source/ThirdParty/leveldb/include/leveldb/status.h \
    6485         Source/ThirdParty/leveldb/include/leveldb/table_builder.h \
    6486         Source/ThirdParty/leveldb/include/leveldb/table.h \
    6487         Source/ThirdParty/leveldb/include/leveldb/write_batch.h \
    6488         Source/ThirdParty/leveldb/port/atomic_pointer.h \
    6489         Source/ThirdParty/leveldb/port/port_example.h \
    6490         Source/ThirdParty/leveldb/port/port.h \
    6491         Source/ThirdParty/leveldb/port/port_posix.cc \
    6492         Source/ThirdParty/leveldb/port/port_posix.h \
    6493         Source/ThirdParty/leveldb/port/thread_annotations.h \
    6494         Source/ThirdParty/leveldb/port/win/stdint.h \
    6495         Source/ThirdParty/leveldb/table/block_builder.cc \
    6496         Source/ThirdParty/leveldb/table/block_builder.h \
    6497         Source/ThirdParty/leveldb/table/block.cc \
    6498         Source/ThirdParty/leveldb/table/block.h \
    6499         Source/ThirdParty/leveldb/table/filter_block.cc \
    6500         Source/ThirdParty/leveldb/table/filter_block.h \
    6501         Source/ThirdParty/leveldb/table/format.cc \
    6502         Source/ThirdParty/leveldb/table/format.h \
    6503         Source/ThirdParty/leveldb/table/iterator.cc \
    6504         Source/ThirdParty/leveldb/table/iterator_wrapper.h \
    6505         Source/ThirdParty/leveldb/table/merger.cc \
    6506         Source/ThirdParty/leveldb/table/merger.h \
    6507         Source/ThirdParty/leveldb/table/table_builder.cc \
    6508         Source/ThirdParty/leveldb/table/table.cc \
    6509         Source/ThirdParty/leveldb/table/two_level_iterator.cc \
    6510         Source/ThirdParty/leveldb/table/two_level_iterator.h \
    6511         Source/ThirdParty/leveldb/util/arena.cc \
    6512         Source/ThirdParty/leveldb/util/arena.h \
    6513         Source/ThirdParty/leveldb/util/bloom.cc \
    6514         Source/ThirdParty/leveldb/util/cache.cc \
    6515         Source/ThirdParty/leveldb/util/coding.cc \
    6516         Source/ThirdParty/leveldb/util/coding.h \
    6517         Source/ThirdParty/leveldb/util/comparator.cc \
    6518         Source/ThirdParty/leveldb/util/crc32c.cc \
    6519         Source/ThirdParty/leveldb/util/crc32c.h \
    6520         Source/ThirdParty/leveldb/util/env.cc \
    6521         Source/ThirdParty/leveldb/util/env_posix.cc \
    6522         Source/ThirdParty/leveldb/util/filter_policy.cc \
    6523         Source/ThirdParty/leveldb/util/hash.cc \
    6524         Source/ThirdParty/leveldb/util/hash.h \
    6525         Source/ThirdParty/leveldb/util/histogram.cc \
    6526         Source/ThirdParty/leveldb/util/histogram.h \
    6527         Source/ThirdParty/leveldb/util/logging.cc \
    6528         Source/ThirdParty/leveldb/util/logging.h \
    6529         Source/ThirdParty/leveldb/util/mutexlock.h \
    6530         Source/ThirdParty/leveldb/util/options.cc \
    6531         Source/ThirdParty/leveldb/util/posix_logger.h \
    6532         Source/ThirdParty/leveldb/util/random.h \
    6533         Source/ThirdParty/leveldb/util/status.cc
Note: See TracChangeset for help on using the changeset viewer.