Changeset facc44f for src

Timestamp:

Feb 20, 2017, 12:05:40 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

bd9bcc8

Parents:

cf97ccb

Message:

Added option to compile without concurrency using --disable-threading on the configure (will fail concurrency related tests)

Location:

src/libcfa

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (4 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}

src/libcfa/Makefile.in

@@ -41 +41 @@
 @BUILD_RELEASE_TRUE@am__append_1 = libcfa.a
 @BUILD_DEBUG_TRUE@am__append_2 = libcfa-d.a
+
+# not all platforms support concurrency, add option do disable it
+@BUILD_CONCURRENCY_TRUE@am__append_3 = containers/vector concurrency/coroutines concurrency/threads concurrency/kernel
+
+# not all platforms support concurrency, add option do disable it
+@BUILD_CONCURRENCY_TRUE@am__append_4 = concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c
 subdir = src/libcfa
-DIST_COMMON = $(nobase_cfa_include_HEADERS) $(srcdir)/Makefile.am \
-        $(srcdir)/Makefile.in
+DIST_COMMON = $(am__nobase_cfa_include_HEADERS_DIST) \
+        $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -91 +97 @@
 libcfa_d_a_AR = $(AR) $(ARFLAGS)
 libcfa_d_a_LIBADD =
+am__libcfa_d_a_SOURCES_DIST = libcfa-prelude.c limits.c stdlib.c \
+        math.c iostream.c fstream.c iterator.c rational.c assert.c \
+        containers/vector.c concurrency/coroutines.c \
+        concurrency/threads.c concurrency/kernel.c \
+        concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c
 am__dirstamp = $(am__leading_dot)dirstamp
-am__objects_1 = libcfa_d_a-limits.$(OBJEXT) \
+@BUILD_CONCURRENCY_TRUE@am__objects_1 = containers/libcfa_d_a-vector.$(OBJEXT) \
+@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_d_a-coroutines.$(OBJEXT) \
+@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_d_a-threads.$(OBJEXT) \
+@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_d_a-kernel.$(OBJEXT)
+am__objects_2 = libcfa_d_a-limits.$(OBJEXT) \
         libcfa_d_a-stdlib.$(OBJEXT) libcfa_d_a-math.$(OBJEXT) \
         libcfa_d_a-iostream.$(OBJEXT) libcfa_d_a-fstream.$(OBJEXT) \
         libcfa_d_a-iterator.$(OBJEXT) libcfa_d_a-rational.$(OBJEXT) \
-        libcfa_d_a-assert.$(OBJEXT) \
-        containers/libcfa_d_a-vector.$(OBJEXT) \
-        concurrency/libcfa_d_a-coroutines.$(OBJEXT) \
-        concurrency/libcfa_d_a-threads.$(OBJEXT) \
-        concurrency/libcfa_d_a-kernel.$(OBJEXT)
-am__objects_2 = libcfa_d_a-libcfa-prelude.$(OBJEXT) $(am__objects_1) \
-        concurrency/CtxSwitch-@MACHINE_TYPE@.$(OBJEXT) \
-        concurrency/libcfa_d_a-invoke.$(OBJEXT)
-am_libcfa_d_a_OBJECTS = $(am__objects_2)
+        libcfa_d_a-assert.$(OBJEXT) $(am__objects_1)
+@BUILD_CONCURRENCY_TRUE@am__objects_3 = concurrency/CtxSwitch-@MACHINE_TYPE@.$(OBJEXT) \
+@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_d_a-invoke.$(OBJEXT)
+am__objects_4 = libcfa_d_a-libcfa-prelude.$(OBJEXT) $(am__objects_2) \
+        $(am__objects_3)
+am_libcfa_d_a_OBJECTS = $(am__objects_4)
 libcfa_d_a_OBJECTS = $(am_libcfa_d_a_OBJECTS)
 libcfa_a_AR = $(AR) $(ARFLAGS)
 libcfa_a_LIBADD =
-am__objects_3 = libcfa_a-limits.$(OBJEXT) libcfa_a-stdlib.$(OBJEXT) \
+am__libcfa_a_SOURCES_DIST = libcfa-prelude.c limits.c stdlib.c math.c \
+        iostream.c fstream.c iterator.c rational.c assert.c \
+        containers/vector.c concurrency/coroutines.c \
+        concurrency/threads.c concurrency/kernel.c \
+        concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c
+@BUILD_CONCURRENCY_TRUE@am__objects_5 =  \
+@BUILD_CONCURRENCY_TRUE@        containers/libcfa_a-vector.$(OBJEXT) \
+@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_a-coroutines.$(OBJEXT) \
+@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_a-threads.$(OBJEXT) \
+@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_a-kernel.$(OBJEXT)
+am__objects_6 = libcfa_a-limits.$(OBJEXT) libcfa_a-stdlib.$(OBJEXT) \
         libcfa_a-math.$(OBJEXT) libcfa_a-iostream.$(OBJEXT) \
         libcfa_a-fstream.$(OBJEXT) libcfa_a-iterator.$(OBJEXT) \
         libcfa_a-rational.$(OBJEXT) libcfa_a-assert.$(OBJEXT) \
-        containers/libcfa_a-vector.$(OBJEXT) \
-        concurrency/libcfa_a-coroutines.$(OBJEXT) \
-        concurrency/libcfa_a-threads.$(OBJEXT) \
-        concurrency/libcfa_a-kernel.$(OBJEXT)
-am__objects_4 = libcfa_a-libcfa-prelude.$(OBJEXT) $(am__objects_3) \
-        concurrency/CtxSwitch-@MACHINE_TYPE@.$(OBJEXT) \
-        concurrency/libcfa_a-invoke.$(OBJEXT)
-am_libcfa_a_OBJECTS = $(am__objects_4)
+        $(am__objects_5)
+@BUILD_CONCURRENCY_TRUE@am__objects_7 = concurrency/CtxSwitch-@MACHINE_TYPE@.$(OBJEXT) \
+@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_a-invoke.$(OBJEXT)
+am__objects_8 = libcfa_a-libcfa-prelude.$(OBJEXT) $(am__objects_6) \
+        $(am__objects_7)
+am_libcfa_a_OBJECTS = $(am__objects_8)
 libcfa_a_OBJECTS = $(am_libcfa_a_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
@@ -147 +167 @@
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libcfa_d_a_SOURCES) $(libcfa_a_SOURCES)
-DIST_SOURCES = $(libcfa_d_a_SOURCES) $(libcfa_a_SOURCES)
+DIST_SOURCES = $(am__libcfa_d_a_SOURCES_DIST) \
+        $(am__libcfa_a_SOURCES_DIST)
+am__nobase_cfa_include_HEADERS_DIST = limits stdlib math iostream \
+        fstream iterator rational assert containers/vector \
+        concurrency/coroutines concurrency/threads concurrency/kernel \
+        ${shell echo stdhdr/*} concurrency/invoke.h
 HEADERS = $(nobase_cfa_include_HEADERS)
 ETAGS = etags
@@ -276 +301 @@
 EXTRA_FLAGS = -g -Wall -Wno-unused-function -I${abs_top_srcdir}/src/libcfa/libhdr -imacros libcfa-prelude.c @CFA_FLAGS@
 AM_CCASFLAGS = @CFA_FLAGS@
-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 \
+        $(am__append_3)
 libobjs = ${headers:=.o}
-libsrc = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c
+libsrc = libcfa-prelude.c ${headers:=.c} $(am__append_4)
 libcfa_a_SOURCES = ${libsrc}
 libcfa_a_CFLAGS = -nodebug -O2