Changeset 63be3387 for libcfa/src/Makefile.am

Timestamp:

Nov 14, 2022, 11:52:44 AM (3 years ago)

Author:

caparson <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

7d9598d8

Parents:

b77f0e1 (diff), 19a8c40 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• libcfa/src/Makefile.am (modified) (4 diffs)

libcfa/src/Makefile.am

@@ -62 +62 @@
         containers/array.hfa \
         containers/list.hfa \
-        containers/queueLockFree.hfa \
-        containers/stackLockFree.hfa \
+        containers/lockfree.hfa \
         containers/string_sharectx.hfa \
         containers/vector2.hfa \
@@ -112 +111 @@
         concurrency/invoke.h \
         concurrency/future.hfa \
+        concurrency/once.hfa \
         concurrency/kernel/fwd.hfa \
         concurrency/mutex_stmt.hfa
@@ -127 +127 @@
 
 thread_libsrc = ${inst_thread_headers_src} ${inst_thread_headers_src:.hfa=.cfa} \
+        interpose_thread.cfa \
         bits/signal.hfa \
         concurrency/clib/cfathread.cfa \
@@ -145 +146 @@
         concurrency/stats.cfa \
         concurrency/stats.hfa \
-        concurrency/stats.hfa
+        concurrency/stats.hfa \
+        concurrency/pthread.cfa
 
 else