X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=folly%2FMakefile.am;h=3da17a77cc06b6a9390c5fbc62e37c78f67d301c;hb=b97197908f9ffa978dd9150a621c33b4f7ba4747;hp=235387c2489a73b466dd2b1a4f5d1e9c9196f42f;hpb=8e82fd3453e34da1fe504e5f716a9a268d4e7aae;p=folly.git diff --git a/folly/Makefile.am b/folly/Makefile.am index 235387c2..3da17a77 100644 --- a/folly/Makefile.am +++ b/folly/Makefile.am @@ -6,13 +6,14 @@ CLEANFILES = noinst_PROGRAMS = generate_fingerprint_tables generate_fingerprint_tables_SOURCES = build/GenerateFingerprintTables.cpp -generate_fingerprint_tables_LDADD = libfolly.la +generate_fingerprint_tables_LDADD = libfollybase.la + +noinst_LTLIBRARIES = \ + libfollybase.la lib_LTLIBRARIES = \ libfolly.la \ - libfollybenchmark.la \ - libfollytimeout_queue.la \ - libfollyfingerprint.la + libfollybenchmark.la follyincludedir = $(includedir)/folly @@ -29,6 +30,7 @@ nobase_follyinclude_HEADERS = \ Baton.h \ Benchmark.h \ Bits.h \ + Checksum.h \ Chrono.h \ ConcurrentSkipList.h \ ConcurrentSkipList-inl.h \ @@ -42,11 +44,13 @@ nobase_follyinclude_HEADERS = \ detail/ChecksumDetail.h \ detail/Clock.h \ detail/DiscriminatedPtrDetail.h \ + detail/ExceptionWrapper.h \ detail/FileUtilDetail.h \ detail/FingerprintPolynomial.h \ detail/FunctionalExcept.h \ detail/Futex.h \ detail/GroupVarintDetail.h \ + detail/IPAddress.h \ detail/Malloc.h \ detail/MemoryIdler.h \ detail/MPMCPipelineDetail.h \ @@ -54,25 +58,55 @@ nobase_follyinclude_HEADERS = \ detail/Stats.h \ detail/ThreadLocalDetail.h \ detail/UncaughtExceptionCounter.h \ + Demangle.h \ DiscriminatedPtr.h \ DynamicConverter.h \ dynamic.h \ dynamic-inl.h \ + Exception.h \ + ExceptionWrapper.h \ + EvictingCacheMap.h \ + experimental/Bits.h \ + experimental/EliasFanoCoding.h \ + experimental/EventCount.h \ + experimental/io/FsUtil.h \ + experimental/TestUtil.h \ + experimental/wangle/concurrent/Codel.h \ + experimental/wangle/ConnectionManager.h \ + experimental/wangle/ManagedConnection.h \ FBString.h \ FBVector.h \ File.h \ FileUtil.h \ Fingerprint.h \ folly-config.h \ - Exception.h \ Foreach.h \ FormatArg.h \ Format.h \ Format-inl.h \ + gen/Base.h \ + gen/Base-inl.h \ + gen/Combine.h \ + gen/Combine-inl.h \ + gen/Core.h \ + gen/Core-inl.h \ + gen/File.h \ + gen/File-inl.h \ + gen/Parallel.h \ + gen/Parallel-inl.h \ + gen/ParallelMap.h \ + gen/ParallelMap-inl.h \ + gen/String.h \ + gen/String-inl.h \ GroupVarint.h \ Hash.h \ + IPAddress.h \ + IPAddressV4.h \ + IPAddressV6.h \ + IPAddressException.h \ IndexedMemPool.h \ IntrusiveList.h \ + io/Compression.h \ io/Cursor.h \ io/IOBuf.h \ io/IOBufQueue.h \ @@ -80,17 +114,21 @@ nobase_follyinclude_HEADERS = \ io/RecordIO-inl.h \ io/TypedIOBuf.h \ io/async/AsyncTimeout.h \ + io/async/DelayedDestruction.h \ io/async/EventBase.h \ io/async/EventFDWrapper.h \ io/async/EventHandler.h \ io/async/EventUtil.h \ io/async/NotificationQueue.h \ + io/async/HHWheelTimer.h \ io/async/Request.h \ io/async/TimeoutManager.h \ json.h \ Lazy.h \ + LifoSem.h \ Likely.h \ Logging.h \ + MacAddress.h \ Malloc.h \ MapUtil.h \ Memory.h \ @@ -105,11 +143,13 @@ nobase_follyinclude_HEADERS = \ Preprocessor.h \ ProducerConsumerQueue.h \ Random.h \ + Random-inl.h \ Range.h \ RWSpinLock.h \ ScopeGuard.h \ SmallLocks.h \ small_vector.h \ + SocketAddress.h \ sorted_vector_types.h \ SpookyHashV1.h \ SpookyHashV2.h \ @@ -132,12 +172,14 @@ nobase_follyinclude_HEADERS = \ ThreadCachedArena.h \ ThreadCachedInt.h \ ThreadLocal.h \ + ThreadName.h \ TimeoutQueue.h \ Traits.h \ Unicode.h \ Uri.h \ Uri-inl.h \ Varint.h \ + VersionCheck.h \ wangle/Executor.h \ wangle/Future-inl.h \ wangle/Future.h \ @@ -152,7 +194,7 @@ nobase_follyinclude_HEADERS = \ wangle/Try-inl.h \ wangle/Try.h \ wangle/WangleException.h \ - wangle/detail.h + wangle/detail/State.h FormatTables.cpp: build/generate_format_tables.py build/generate_format_tables.py @@ -166,19 +208,32 @@ GroupVarintTables.cpp: build/generate_varint_tables.py build/generate_varint_tables.py CLEANFILES += GroupVarintTables.cpp -libfolly_la_SOURCES = \ - Bits.cpp \ +libfollybase_la_SOURCES = \ Conv.cpp \ Demangle.cpp \ + EscapeTables.cpp \ + Format.cpp \ + FormatTables.cpp \ + Malloc.cpp \ + Range.cpp \ + String.cpp \ + Unicode.cpp + +libfolly_la_SOURCES = \ + Bits.cpp \ detail/CacheLocality.cpp \ dynamic.cpp \ - EscapeTables.cpp \ File.cpp \ FileUtil.cpp \ - Format.cpp \ - FormatTables.cpp \ + FingerprintTables.cpp \ + detail/Futex.cpp \ GroupVarint.cpp \ GroupVarintTables.cpp \ + IPAddress.cpp \ + IPAddressV4.cpp \ + IPAddressV6.cpp \ + LifoSem.cpp \ + io/Compression.cpp \ io/IOBuf.cpp \ io/IOBufQueue.cpp \ io/RecordIO.cpp \ @@ -186,48 +241,60 @@ libfolly_la_SOURCES = \ io/async/EventBase.cpp \ io/async/EventHandler.cpp \ io/async/Request.cpp \ + io/async/HHWheelTimer.cpp \ json.cpp \ detail/MemoryIdler.cpp \ - Malloc.cpp \ + MacAddress.cpp \ MemoryMapping.cpp \ Random.cpp \ - Range.cpp \ + SafeAssert.cpp \ + SocketAddress.cpp \ SpookyHashV1.cpp \ SpookyHashV2.cpp \ stats/Instantiations.cpp \ - String.cpp \ Subprocess.cpp \ ThreadCachedArena.cpp \ TimeoutQueue.cpp \ - Unicode.cpp \ Uri.cpp \ + Version.cpp \ wangle/InlineExecutor.cpp \ wangle/ManualExecutor.cpp \ - wangle/ThreadGate.cpp + wangle/ThreadGate.cpp \ + experimental/io/FsUtil.cpp \ + experimental/TestUtil.cpp \ + experimental/wangle/concurrent/Codel.cpp \ + experimental/wangle/ConnectionManager.cpp \ + experimental/wangle/ManagedConnection.cpp + +if HAVE_LINUX +nobase_follyinclude_HEADERS += \ + experimental/io/HugePages.h +libfolly_la_SOURCES += \ + experimental/io/HugePages.cpp +endif if !HAVE_LINUX nobase_follyinclude_HEADERS += detail/Clock.h -libfolly_la_SOURCES += detail/Clock.cpp +libfollybase_la_SOURCES += detail/Clock.cpp endif if !HAVE_WEAK_SYMBOLS -libfolly_la_SOURCES += detail/MallocImpl.cpp +libfollybase_la_SOURCES += detail/MallocImpl.cpp endif if !HAVE_BITS_FUNCTEXCEPT -libfolly_la_SOURCES += detail/FunctionalExcept.cpp +libfollybase_la_SOURCES += detail/FunctionalExcept.cpp endif +libfollybase_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LT_VERSION) + +libfolly_la_LIBADD = libfollybase.la +libfolly_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LT_VERSION) + FingerprintTables.cpp: generate_fingerprint_tables ./generate_fingerprint_tables CLEANFILES += FingerprintTables.cpp -libfollyfingerprint_la_SOURCES = \ - FingerprintTables.cpp -libfollyfingerprint_la_LIBADD = libfolly.la - libfollybenchmark_la_SOURCES = Benchmark.cpp libfollybenchmark_la_LIBADD = libfolly.la - -libfollytimeout_queue_la_SOURCES = TimeoutQueue.cpp -libfollytimeout_queue_la_LIBADD = libfolly.la +libfollybenchmark_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LT_VERSION)