Changeset 884f1409 for libcfa/src/Makefile.am
- Timestamp:
- Jul 19, 2019, 4:52:59 PM (5 years ago)
- Branches:
- ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
- Children:
- b5ce31e, fd642d2
- Parents:
- e723100 (diff), 335d81f (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
libcfa/src/Makefile.am
re723100 r884f1409 22 22 23 23 libdir = ${CFA_LIBDIR} 24 lib_LTLIBRARIES = libcfa.la 24 lib_LTLIBRARIES = libcfa.la libcfathread.la 25 25 26 26 VPATH += :../prelude … … 41 41 containers/maybe.hfa containers/pair.hfa containers/result.hfa containers/vector.hfa 42 42 43 # not all platforms support concurrency, add option do disable it44 headers_nosrc += concurrency/invoke.h45 headers += concurrency/coroutine.hfa concurrency/thread.hfa concurrency/kernel.hfa concurrency/monitor.hfa concurrency/mutex.hfa46 47 43 libsrc = startup.cfa interpose.cfa bits/debug.cfa assert.cfa exception.c virtual.c heap.cfa ${headers:.hfa=.cfa} 48 44 49 45 # not all platforms support concurrency, add option do disable it 50 libsrc += concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa concurrency/invoke.c concurrency/preemption.cfa 46 thread_headers_nosrc = concurrency/invoke.h 47 thread_headers = concurrency/coroutine.hfa concurrency/thread.hfa concurrency/kernel.hfa concurrency/monitor.hfa concurrency/mutex.hfa 48 thread_libsrc = concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa concurrency/invoke.c concurrency/preemption.cfa ${thread_headers:.hfa=.cfa} 51 49 else 52 50 headers = 51 thread_headers = 53 52 headers_nosrc = 53 thread_headers_nosrc = 54 54 libsrc = 55 55 endif … … 64 64 $(libobjs) : @CFACC@ @CFACPP@ prelude.cfa 65 65 66 thread_libobjs = $(addsuffix .lo, $(basename $(filter %.cfa,$(thread_libsrc)))) 67 $(thread_libobjs) : @CFACC@ @CFACPP@ prelude.cfa 68 66 69 67 70 # .deps inclusion is not done automatically by automake for new languages … … 72 75 73 76 -include $(libdeps) 77 78 thread_libdeps = $(join \ 79 $(addsuffix $(DEPDIR)/ , $(dir $(thread_libobjs) ) ), \ 80 $(notdir ${thread_libobjs:.lo=.Plo}) \ 81 ) 82 83 -include $(thread_libdeps) 84 74 85 75 86 prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@ … … 85 96 libcfa_la_LDFLAGS = -version-info @CFA_VERSION@ 86 97 98 libcfathread_la_SOURCES = ${thread_libsrc} 99 libcfathread_la_LDFLAGS = -version-info @CFA_VERSION@ 100 87 101 stdhdr = $(shell find $(srcdir)/stdhdr -type f -printf "%p ") 88 102 89 103 cfa_includedir = $(CFA_INCDIR) 90 nobase_cfa_include_HEADERS = ${stdhdr} ${headers} ${headers_nosrc} 104 nobase_cfa_include_HEADERS = ${stdhdr} ${headers} ${headers_nosrc} ${thread_headers} ${thread_headers_nosrc} 91 105 92 106 #----------------------------------------------------------------------------------------------------------------
Note: See TracChangeset
for help on using the changeset viewer.