X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=folly%2FMakefile.am;h=1b28ff7ff88d336826c1ad18c04aa8a83874b691;hb=a56a988a8cd07c7e3250f27594b8f92c9274b30d;hp=b3b355f25b3596a51abefb0e9d56179d0d14f354;hpb=bd52f50227674b1f25eaa091610a61643fc354cb;p=folly.git

diff --git a/folly/Makefile.am b/folly/Makefile.am
index b3b355f2..1b28ff7f 100644
--- a/folly/Makefile.am
+++ b/folly/Makefile.am
@@ -96,32 +96,32 @@ nobase_follyinclude_HEADERS = \
 	experimental/EventCount.h \
 	experimental/Instructions.h \
 	experimental/bser/Bser.h \
-	experimental/fibers/AddTasks.h \
-	experimental/fibers/AddTasks-inl.h \
-	experimental/fibers/Baton.h \
-	experimental/fibers/Baton-inl.h \
-	experimental/fibers/BoostContextCompatibility.h \
-	experimental/fibers/EventBaseLoopController.h \
-	experimental/fibers/EventBaseLoopController-inl.h \
-	experimental/fibers/Fiber.h \
-	experimental/fibers/Fiber-inl.h \
-	experimental/fibers/FiberManager.h \
-	experimental/fibers/FiberManager-inl.h \
-	experimental/fibers/FiberManagerMap.h \
-	experimental/fibers/ForEach.h \
-	experimental/fibers/ForEach-inl.h \
-	experimental/fibers/GenericBaton.h \
-	experimental/fibers/GuardPageAllocator.h \
-	experimental/fibers/LoopController.h \
-	experimental/fibers/Promise.h \
-	experimental/fibers/Promise-inl.h \
-	experimental/fibers/SimpleLoopController.h \
-	experimental/fibers/TimedMutex.h \
-	experimental/fibers/TimedMutex-inl.h \
-	experimental/fibers/TimeoutController.h \
-	experimental/fibers/traits.h \
-	experimental/fibers/WhenN.h \
-	experimental/fibers/WhenN-inl.h \
+	fibers/AddTasks.h \
+	fibers/AddTasks-inl.h \
+	fibers/Baton.h \
+	fibers/Baton-inl.h \
+	fibers/BoostContextCompatibility.h \
+	fibers/EventBaseLoopController.h \
+	fibers/EventBaseLoopController-inl.h \
+	fibers/Fiber.h \
+	fibers/Fiber-inl.h \
+	fibers/FiberManager.h \
+	fibers/FiberManager-inl.h \
+	fibers/FiberManagerMap.h \
+	fibers/ForEach.h \
+	fibers/ForEach-inl.h \
+	fibers/GenericBaton.h \
+	fibers/GuardPageAllocator.h \
+	fibers/LoopController.h \
+	fibers/Promise.h \
+	fibers/Promise-inl.h \
+	fibers/SimpleLoopController.h \
+	fibers/TimedMutex.h \
+	fibers/TimedMutex-inl.h \
+	fibers/TimeoutController.h \
+	fibers/traits.h \
+	fibers/WhenN.h \
+	fibers/WhenN-inl.h \
 	experimental/FunctionScheduler.h \
 	experimental/FutureDAG.h \
 	experimental/io/FsUtil.h \
@@ -156,7 +156,6 @@ nobase_follyinclude_HEADERS = \
 	Format.h \
 	Format-inl.h \
 	futures/Barrier.h \
-	futures/ThreadedExecutor.h \
 	futures/DrivableExecutor.h \
 	futures/Future-pre.h \
 	futures/helpers.h \
@@ -174,9 +173,6 @@ nobase_follyinclude_HEADERS = \
 	futures/SharedPromise-inl.h \
 	futures/ThreadWheelTimekeeper.h \
 	futures/Timekeeper.h \
-	futures/Try-inl.h \
-	futures/Try.h \
-	futures/Unit.h \
 	futures/detail/Core.h \
 	futures/detail/FSM.h \
 	futures/detail/Types.h \
@@ -347,8 +343,11 @@ nobase_follyinclude_HEADERS = \
 	ThreadName.h \
 	TimeoutQueue.h \
 	Traits.h \
+	Try-inl.h \
+	Try.h \
 	Unicode.h \
 	Function.h \
+	Unit.h \
 	Uri.h \
 	Uri-inl.h \
 	Varint.h \
@@ -387,7 +386,6 @@ libfolly_la_SOURCES = \
 	FileUtil.cpp \
 	FingerprintTables.cpp \
 	futures/Barrier.cpp \
-	futures/ThreadedExecutor.cpp \
 	futures/Future.cpp \
 	futures/InlineExecutor.cpp \
 	futures/ManualExecutor.cpp \
@@ -446,6 +444,7 @@ libfolly_la_SOURCES = \
 	portability/SysResource.cpp \
 	portability/SysStat.cpp \
 	portability/SysTime.cpp \
+	portability/SysUio.cpp \
 	portability/Time.cpp \
 	portability/Unistd.cpp \
 	Random.cpp \
@@ -465,12 +464,12 @@ libfolly_la_SOURCES = \
 	experimental/bser/Dump.cpp \
 	experimental/bser/Load.cpp \
 	experimental/DynamicParser.cpp \
-	experimental/fibers/Baton.cpp \
-	experimental/fibers/Fiber.cpp \
-	experimental/fibers/FiberManager.cpp \
-	experimental/fibers/FiberManagerMap.cpp \
-	experimental/fibers/GuardPageAllocator.cpp \
-	experimental/fibers/TimeoutController.cpp \
+	fibers/Baton.cpp \
+	fibers/Fiber.cpp \
+	fibers/FiberManager.cpp \
+	fibers/FiberManagerMap.cpp \
+	fibers/GuardPageAllocator.cpp \
+	fibers/TimeoutController.cpp \
 	experimental/FunctionScheduler.cpp \
 	experimental/io/FsUtil.cpp \
 	experimental/JSONSchema.cpp \