Changeset 949339b for libcfa/src/Makefile.am

Timestamp:

Sep 27, 2021, 2:09:55 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

cc287800

Parents:

4e28d2e9 (diff), 056cbdb (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) (7 diffs)

libcfa/src/Makefile.am

@@ -48 +48 @@
         math.hfa \
         time_t.hfa \
+        bits/algorithm.hfa \
         bits/align.hfa \
         bits/containers.hfa \
@@ -59 +60 @@
         containers/array.hfa \
         concurrency/iofwd.hfa \
-        concurrency/mutex_stmt.hfa \
         containers/list.hfa \
         containers/queueLockFree.hfa \
@@ -78 +78 @@
         memory.hfa \
         parseargs.hfa \
+        parseconfig.hfa \
         rational.hfa \
         stdlib.hfa \
@@ -86 +87 @@
         containers/pair.hfa \
         containers/result.hfa \
+        containers/string.hfa \
+        containers/string_res.hfa \
         containers/vector.hfa \
         device/cpu.hfa
@@ -91 +94 @@
 libsrc = ${inst_headers_src} ${inst_headers_src:.hfa=.cfa} \
         assert.cfa \
-        bits/algorithm.hfa \
         bits/debug.cfa \
         exception.c \
@@ -107 +109 @@
         concurrency/invoke.h \
         concurrency/future.hfa \
-        concurrency/kernel/fwd.hfa
+        concurrency/kernel/fwd.hfa \
+        concurrency/mutex_stmt.hfa
 
 inst_thread_headers_src = \
@@ -193 +196 @@
         $(CFACOMPILE) -quiet -XCFA,-l ${<} -c -o ${@}
 
+concurrency/io/call.cfa: $(srcdir)/concurrency/io/call.cfa.in
+        ${AM_V_GEN}python3 $< > $@
+
 #----------------------------------------------------------------------------------------------------------------
 libcfa_la_SOURCES = ${libsrc}