X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=folly%2FMakefile.am;h=ffbf0dc9ec9a0866a10bea49c0b03ab630a1de0d;hb=a0359850fd45080ff0862ca0a11884efb424d7d2;hp=76ad6a30ea02aad1809f2cd16b402b2c1cb1f065;hpb=03bcae3a1552e80764cceb60d100ca2d771b2a5b;p=folly.git

diff --git a/folly/Makefile.am b/folly/Makefile.am
index 76ad6a30..ffbf0dc9 100644
--- a/folly/Makefile.am
+++ b/folly/Makefile.am
@@ -55,6 +55,7 @@ nobase_follyinclude_HEADERS = \
 	detail/MemoryIdler.h \
 	detail/MPMCPipelineDetail.h \
 	detail/SlowFingerprint.h \
+	detail/SpinLockImpl.h \
 	detail/Stats.h \
 	detail/ThreadLocalDetail.h \
 	detail/UncaughtExceptionCounter.h \
@@ -65,29 +66,17 @@ nobase_follyinclude_HEADERS = \
 	dynamic-inl.h \
 	Exception.h \
 	ExceptionWrapper.h \
+	Executor.h \
 	EvictingCacheMap.h \
+	experimental/AutoTimer.h \
 	experimental/Bits.h \
 	experimental/EliasFanoCoding.h \
 	experimental/EventCount.h \
 	experimental/io/FsUtil.h \
 	experimental/Singleton.h \
+	experimental/Singleton-inl.h \
 	experimental/TestUtil.h \
-	experimental/wangle/concurrent/BlockingQueue.h \
-	experimental/wangle/concurrent/Codel.h \
-	experimental/wangle/concurrent/CPUThreadPoolExecutor.h \
-	experimental/wangle/concurrent/FutureExecutor.h \
-	experimental/wangle/concurrent/IOThreadPoolExecutor.h \
-	experimental/wangle/concurrent/LifoSemMPMCQueue.h \
-	experimental/wangle/concurrent/NamedThreadFactory.h \
-	experimental/wangle/concurrent/ThreadFactory.h \
-	experimental/wangle/concurrent/ThreadPoolExecutor.h \
-	experimental/wangle/rx/Observable.h \
-	experimental/wangle/rx/Observer.h \
-	experimental/wangle/rx/Subject.h \
-	experimental/wangle/rx/Subscription.h \
-	experimental/wangle/rx/types.h \
-	experimental/wangle/ConnectionManager.h \
-	experimental/wangle/ManagedConnection.h \
+	experimental/Select64.h \
 	FBString.h \
 	FBVector.h \
 	File.h \
@@ -98,6 +87,25 @@ nobase_follyinclude_HEADERS = \
 	FormatArg.h \
 	Format.h \
 	Format-inl.h \
+	futures/Deprecated.h \
+	futures/DrivableExecutor.h \
+	futures/Future-inl.h \
+	futures/Future.h \
+	futures/FutureException.h \
+	futures/InlineExecutor.h \
+	futures/ManualExecutor.h \
+	futures/OpaqueCallbackShunt.h \
+	futures/Promise-inl.h \
+	futures/Promise.h \
+	futures/QueuedImmediateExecutor.h \
+	futures/ScheduledExecutor.h \
+	futures/Timekeeper.h \
+	futures/Try-inl.h \
+	futures/Try.h \
+	futures/detail/Core.h \
+	futures/detail/FSM.h \
+	futures/detail/ThreadWheelTimekeeper.h \
+	futures/detail/Types.h \
 	gen/Base.h \
 	gen/Base-inl.h \
 	gen/Combine.h \
@@ -124,15 +132,17 @@ nobase_follyinclude_HEADERS = \
 	io/Cursor.h \
 	io/IOBuf.h \
 	io/IOBufQueue.h \
-	io/PortableSpinLock.h \
 	io/RecordIO.h \
 	io/RecordIO-inl.h \
 	io/TypedIOBuf.h \
 	io/ShutdownSocketSet.h \
 	io/async/AsyncTimeout.h \
 	io/async/AsyncTransport.h \
+	io/async/AsyncUDPServerSocket.h \
+	io/async/AsyncUDPSocket.h \
 	io/async/AsyncServerSocket.h \
 	io/async/AsyncSocket.h \
+	io/async/AsyncSSLSocket.h \
 	io/async/AsyncSocketException.h \
 	io/async/DelayedDestruction.h \
 	io/async/EventBase.h \
@@ -143,7 +153,11 @@ nobase_follyinclude_HEADERS = \
 	io/async/NotificationQueue.h \
 	io/async/HHWheelTimer.h \
 	io/async/Request.h \
+	io/async/SSLContext.h \
 	io/async/TimeoutManager.h \
+	io/async/test/TimeUtil.h \
+	io/async/test/UndelayedDestruction.h \
+	io/async/test/Util.h \
 	json.h \
 	Lazy.h \
 	LifoSem.h \
@@ -172,6 +186,7 @@ nobase_follyinclude_HEADERS = \
 	small_vector.h \
 	SocketAddress.h \
 	sorted_vector_types.h \
+	SpinLock.h \
 	SpookyHashV1.h \
 	SpookyHashV2.h \
 	stats/BucketedTimeSeries-defs.h \
@@ -201,24 +216,52 @@ nobase_follyinclude_HEADERS = \
 	Uri-inl.h \
 	Varint.h \
 	VersionCheck.h \
-	wangle/Deprecated.h \
-	wangle/Executor.h \
-	wangle/Future-inl.h \
-	wangle/Future.h \
-	wangle/InlineExecutor.h \
-	wangle/Later-inl.h \
-	wangle/Later.h \
-	wangle/ManualExecutor.h \
-	wangle/OpaqueCallbackShunt.h \
-	wangle/Promise-inl.h \
-	wangle/Promise.h \
-	wangle/QueuedImmediateExecutor.h \
-	wangle/ScheduledExecutor.h \
-	wangle/Try-inl.h \
-	wangle/Try.h \
-	wangle/WangleException.h \
-	wangle/detail/Core.h \
-	wangle/detail/FSM.h
+	wangle/acceptor/Acceptor.h \
+	wangle/acceptor/ConnectionCounter.h \
+	wangle/acceptor/ConnectionManager.h \
+	wangle/acceptor/DomainNameMisc.h \
+	wangle/acceptor/LoadShedConfiguration.h \
+	wangle/acceptor/ManagedConnection.h \
+	wangle/acceptor/NetworkAddress.h \
+	wangle/acceptor/ServerSocketConfig.h \
+	wangle/acceptor/SocketOptions.h \
+	wangle/acceptor/TransportInfo.h \
+	wangle/bootstrap/ServerBootstrap.h \
+	wangle/bootstrap/ServerBootstrap-inl.h \
+	wangle/bootstrap/ClientBootstrap.h \
+	wangle/channel/AsyncSocketHandler.h \
+	wangle/channel/ChannelHandler.h \
+	wangle/channel/ChannelHandlerContext.h \
+	wangle/channel/ChannelPipeline.h \
+	wangle/channel/OutputBufferingHandler.h \
+	wangle/concurrent/BlockingQueue.h \
+	wangle/concurrent/Codel.h \
+	wangle/concurrent/CPUThreadPoolExecutor.h \
+	wangle/concurrent/FutureExecutor.h \
+	wangle/concurrent/IOExecutor.h \
+	wangle/concurrent/IOThreadPoolExecutor.h \
+	wangle/concurrent/GlobalExecutor.h \
+	wangle/concurrent/LifoSemMPMCQueue.h \
+	wangle/concurrent/NamedThreadFactory.h \
+	wangle/concurrent/ThreadFactory.h \
+	wangle/concurrent/ThreadPoolExecutor.h \
+	wangle/rx/Observable.h \
+	wangle/rx/Observer.h \
+	wangle/rx/Subject.h \
+	wangle/rx/Subscription.h \
+	wangle/rx/types.h \
+	wangle/ssl/ClientHelloExtStats.h \
+	wangle/ssl/DHParam.h \
+	wangle/ssl/PasswordInFile.h \
+	wangle/ssl/SSLCacheOptions.h \
+	wangle/ssl/SSLCacheProvider.h \
+	wangle/ssl/SSLContextConfig.h \
+	wangle/ssl/SSLContextManager.h \
+	wangle/ssl/SSLSessionCacheManager.h \
+	wangle/ssl/SSLStats.h \
+	wangle/ssl/SSLUtil.h \
+	wangle/ssl/TLSTicketKeyManager.h \
+	wangle/ssl/TLSTicketKeySeeds.h
 
 FormatTables.cpp: build/generate_format_tables.py
 	build/generate_format_tables.py
@@ -250,6 +293,11 @@ libfolly_la_SOURCES = \
 	File.cpp \
 	FileUtil.cpp \
 	FingerprintTables.cpp \
+	futures/detail/ThreadWheelTimekeeper.cpp \
+	futures/Future.cpp \
+	futures/InlineExecutor.cpp \
+	futures/ManualExecutor.cpp \
+	futures/QueuedImmediateExecutor.cpp \
 	detail/Futex.cpp \
 	GroupVarint.cpp \
 	GroupVarintTables.cpp \
@@ -263,13 +311,17 @@ libfolly_la_SOURCES = \
 	io/RecordIO.cpp \
 	io/ShutdownSocketSet.cpp \
 	io/async/AsyncTimeout.cpp \
+	io/async/AsyncUDPSocket.cpp \
 	io/async/AsyncServerSocket.cpp \
 	io/async/AsyncSocket.cpp \
+	io/async/AsyncSSLSocket.cpp \
 	io/async/EventBase.cpp \
 	io/async/EventBaseManager.cpp \
 	io/async/EventHandler.cpp \
 	io/async/Request.cpp \
+	io/async/SSLContext.cpp \
 	io/async/HHWheelTimer.cpp \
+	io/async/test/TimeUtil.cpp \
 	json.cpp \
 	detail/MemoryIdler.cpp \
 	MacAddress.cpp \
@@ -285,17 +337,27 @@ libfolly_la_SOURCES = \
 	TimeoutQueue.cpp \
 	Uri.cpp \
 	Version.cpp \
-	wangle/InlineExecutor.cpp \
-	wangle/ManualExecutor.cpp \
 	experimental/io/FsUtil.cpp \
 	experimental/Singleton.cpp \
 	experimental/TestUtil.cpp \
-	experimental/wangle/concurrent/CPUThreadPoolExecutor.cpp \
-	experimental/wangle/concurrent/Codel.cpp \
-	experimental/wangle/concurrent/IOThreadPoolExecutor.cpp \
-	experimental/wangle/concurrent/ThreadPoolExecutor.cpp \
-	experimental/wangle/ConnectionManager.cpp \
-	experimental/wangle/ManagedConnection.cpp
+	experimental/Select64.cpp \
+	wangle/acceptor/Acceptor.cpp \
+	wangle/acceptor/ConnectionManager.cpp \
+	wangle/acceptor/LoadShedConfiguration.cpp \
+	wangle/acceptor/ManagedConnection.cpp \
+	wangle/acceptor/SocketOptions.cpp \
+	wangle/acceptor/TransportInfo.cpp \
+	wangle/bootstrap/ServerBootstrap.cpp \
+	wangle/concurrent/CPUThreadPoolExecutor.cpp \
+	wangle/concurrent/Codel.cpp \
+	wangle/concurrent/IOThreadPoolExecutor.cpp \
+	wangle/concurrent/GlobalExecutor.cpp \
+	wangle/concurrent/ThreadPoolExecutor.cpp \
+	wangle/ssl/PasswordInFile.cpp \
+	wangle/ssl/SSLContextManager.cpp \
+	wangle/ssl/SSLSessionCacheManager.cpp \
+	wangle/ssl/SSLUtil.cpp \
+	wangle/ssl/TLSTicketKeyManager.cpp
 
 if HAVE_LINUX
 nobase_follyinclude_HEADERS += \
@@ -320,7 +382,7 @@ endif
 libfollybase_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LT_VERSION)
 
 libfolly_la_LIBADD = libfollybase.la
-libfolly_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LT_VERSION)
+libfolly_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LT_VERSION) -lssl
 
 FingerprintTables.cpp: generate_fingerprint_tables
 	./generate_fingerprint_tables