Changeset 210587b for src/libcfa/Makefile.am

Timestamp:

Feb 20, 2017, 12:37:03 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

fc39193

Parents:

7fb1db7 (diff), 3bff885 (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 plg2:software/cfa/cfa-cc

File:

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

src/libcfa/Makefile.am

@@ -40 +40 @@
 CC = ${abs_top_srcdir}/src/driver/cfa
 
-headers = limits stdlib math iostream fstream iterator rational assert containers/vector concurrency/coroutines concurrency/threads concurrency/kernel
-runtimehdrs = concurrency
+headers = limits stdlib math iostream fstream iterator rational assert
+
+# not all platforms support concurrency, add option do disable it
+if BUILD_CONCURRENCY
+headers += containers/vector concurrency/coroutines concurrency/threads concurrency/kernel
+endif
+
 libobjs = ${headers:=.o}
+libsrc = libcfa-prelude.c ${headers:=.c}
+
+# not all platforms support concurrency, add option do disable it
+if BUILD_CONCURRENCY
+libsrc += concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c
+endif
 
 # extensionless header files are overridden by -o flag in default makerule => explicitly override default rule to silently do nothing
@@ -56 +67 @@
 ${libobjs} : ${abs_top_srcdir}/src/driver/cfa-cpp ${cfalib_DATA} # add dependency to cfa-cpp so all libraries are rebuilt with new translator
 
-libsrc = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c
 
 libcfa_a_SOURCES = ${libsrc}