Changes in libcfa/src/Makefile.am [2026bb6:5806745]

File:

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

libcfa/src/Makefile.am

@@ -22 +22 @@
 
 libdir = ${CFA_LIBDIR}
-lib_LTLIBRARIES =  libcfa.la libcfathread.la
+lib_LTLIBRARIES =  libcfa.la
 
 VPATH += :../prelude
@@ -41 +41 @@
           containers/maybe.hfa containers/pair.hfa containers/result.hfa containers/vector.hfa
 
+# not all platforms support concurrency, add option do disable it
+headers_nosrc += concurrency/invoke.h
+headers += concurrency/coroutine.hfa concurrency/thread.hfa concurrency/kernel.hfa concurrency/monitor.hfa concurrency/mutex.hfa
+
 libsrc = startup.cfa interpose.cfa bits/debug.cfa assert.cfa exception.c virtual.c heap.cfa ${headers:.hfa=.cfa}
 
 # not all platforms support concurrency, add option do disable it
-thread_headers_nosrc = concurrency/invoke.h
-thread_headers = concurrency/coroutine.hfa concurrency/thread.hfa concurrency/kernel.hfa concurrency/monitor.hfa concurrency/mutex.hfa
-thread_libsrc = concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa concurrency/invoke.c concurrency/preemption.cfa ${thread_headers:.hfa=.cfa}
+libsrc += concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa concurrency/invoke.c concurrency/preemption.cfa
 else
 headers =
-thread_headers =
 headers_nosrc =
-thread_headers_nosrc =
 libsrc =
 endif
@@ -64 +64 @@
 $(libobjs) : @CFACC@ @CFACPP@ prelude.cfa
 
-thread_libobjs = $(addsuffix .lo, $(basename $(filter %.cfa,$(thread_libsrc))))
-$(thread_libobjs) : @CFACC@ @CFACPP@ prelude.cfa
-
 
 # .deps inclusion is not done automatically by automake for new languages
@@ -75 +72 @@
 
 -include $(libdeps)
-
-thread_libdeps = $(join \
-        $(addsuffix $(DEPDIR)/ , $(dir $(thread_libobjs) ) ), \
-        $(notdir ${thread_libobjs:.lo=.Plo}) \
-)
-
--include $(thread_libdeps)
-
 
 prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
@@ -96 +85 @@
 libcfa_la_LDFLAGS = -version-info @CFA_VERSION@
 
-libcfathread_la_SOURCES = ${thread_libsrc}
-libcfathread_la_LDFLAGS = -version-info @CFA_VERSION@
-
 stdhdr = $(shell find $(srcdir)/stdhdr -type f -printf "%p ")
 
 cfa_includedir = $(CFA_INCDIR)
-nobase_cfa_include_HEADERS = ${stdhdr} ${headers} ${headers_nosrc} ${thread_headers} ${thread_headers_nosrc}
+nobase_cfa_include_HEADERS = ${stdhdr} ${headers} ${headers_nosrc}
 
 #----------------------------------------------------------------------------------------------------------------