Ignore:
Timestamp:
Feb 20, 2017, 12:37:03 PM (5 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
aaron-thesis, arm-eh, 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, 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:
1 edited

Legend:

Unmodified
Added
Removed
  • src/libcfa/Makefile.in

    r7fb1db7 r210587b  
    4141@BUILD_RELEASE_TRUE@am__append_1 = libcfa.a
    4242@BUILD_DEBUG_TRUE@am__append_2 = libcfa-d.a
     43
     44# not all platforms support concurrency, add option do disable it
     45@BUILD_CONCURRENCY_TRUE@am__append_3 = containers/vector concurrency/coroutines concurrency/threads concurrency/kernel
     46
     47# not all platforms support concurrency, add option do disable it
     48@BUILD_CONCURRENCY_TRUE@am__append_4 = concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c
    4349subdir = src/libcfa
    44 DIST_COMMON = $(nobase_cfa_include_HEADERS) $(srcdir)/Makefile.am \
    45         $(srcdir)/Makefile.in
     50DIST_COMMON = $(am__nobase_cfa_include_HEADERS_DIST) \
     51        $(srcdir)/Makefile.am $(srcdir)/Makefile.in
    4652ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    4753am__aclocal_m4_deps = $(top_srcdir)/configure.ac
     
    9197libcfa_d_a_AR = $(AR) $(ARFLAGS)
    9298libcfa_d_a_LIBADD =
     99am__libcfa_d_a_SOURCES_DIST = libcfa-prelude.c limits.c stdlib.c \
     100        math.c iostream.c fstream.c iterator.c rational.c assert.c \
     101        containers/vector.c concurrency/coroutines.c \
     102        concurrency/threads.c concurrency/kernel.c \
     103        concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c
    93104am__dirstamp = $(am__leading_dot)dirstamp
    94 am__objects_1 = libcfa_d_a-limits.$(OBJEXT) \
     105@BUILD_CONCURRENCY_TRUE@am__objects_1 = containers/libcfa_d_a-vector.$(OBJEXT) \
     106@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_d_a-coroutines.$(OBJEXT) \
     107@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_d_a-threads.$(OBJEXT) \
     108@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_d_a-kernel.$(OBJEXT)
     109am__objects_2 = libcfa_d_a-limits.$(OBJEXT) \
    95110        libcfa_d_a-stdlib.$(OBJEXT) libcfa_d_a-math.$(OBJEXT) \
    96111        libcfa_d_a-iostream.$(OBJEXT) libcfa_d_a-fstream.$(OBJEXT) \
    97112        libcfa_d_a-iterator.$(OBJEXT) libcfa_d_a-rational.$(OBJEXT) \
    98         libcfa_d_a-assert.$(OBJEXT) \
    99         containers/libcfa_d_a-vector.$(OBJEXT) \
    100         concurrency/libcfa_d_a-coroutines.$(OBJEXT) \
    101         concurrency/libcfa_d_a-threads.$(OBJEXT) \
    102         concurrency/libcfa_d_a-kernel.$(OBJEXT)
    103 am__objects_2 = libcfa_d_a-libcfa-prelude.$(OBJEXT) $(am__objects_1) \
    104         concurrency/CtxSwitch-@MACHINE_TYPE@.$(OBJEXT) \
    105         concurrency/libcfa_d_a-invoke.$(OBJEXT)
    106 am_libcfa_d_a_OBJECTS = $(am__objects_2)
     113        libcfa_d_a-assert.$(OBJEXT) $(am__objects_1)
     114@BUILD_CONCURRENCY_TRUE@am__objects_3 = concurrency/CtxSwitch-@MACHINE_TYPE@.$(OBJEXT) \
     115@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_d_a-invoke.$(OBJEXT)
     116am__objects_4 = libcfa_d_a-libcfa-prelude.$(OBJEXT) $(am__objects_2) \
     117        $(am__objects_3)
     118am_libcfa_d_a_OBJECTS = $(am__objects_4)
    107119libcfa_d_a_OBJECTS = $(am_libcfa_d_a_OBJECTS)
    108120libcfa_a_AR = $(AR) $(ARFLAGS)
    109121libcfa_a_LIBADD =
    110 am__objects_3 = libcfa_a-limits.$(OBJEXT) libcfa_a-stdlib.$(OBJEXT) \
     122am__libcfa_a_SOURCES_DIST = libcfa-prelude.c limits.c stdlib.c math.c \
     123        iostream.c fstream.c iterator.c rational.c assert.c \
     124        containers/vector.c concurrency/coroutines.c \
     125        concurrency/threads.c concurrency/kernel.c \
     126        concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c
     127@BUILD_CONCURRENCY_TRUE@am__objects_5 =  \
     128@BUILD_CONCURRENCY_TRUE@        containers/libcfa_a-vector.$(OBJEXT) \
     129@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_a-coroutines.$(OBJEXT) \
     130@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_a-threads.$(OBJEXT) \
     131@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_a-kernel.$(OBJEXT)
     132am__objects_6 = libcfa_a-limits.$(OBJEXT) libcfa_a-stdlib.$(OBJEXT) \
    111133        libcfa_a-math.$(OBJEXT) libcfa_a-iostream.$(OBJEXT) \
    112134        libcfa_a-fstream.$(OBJEXT) libcfa_a-iterator.$(OBJEXT) \
    113135        libcfa_a-rational.$(OBJEXT) libcfa_a-assert.$(OBJEXT) \
    114         containers/libcfa_a-vector.$(OBJEXT) \
    115         concurrency/libcfa_a-coroutines.$(OBJEXT) \
    116         concurrency/libcfa_a-threads.$(OBJEXT) \
    117         concurrency/libcfa_a-kernel.$(OBJEXT)
    118 am__objects_4 = libcfa_a-libcfa-prelude.$(OBJEXT) $(am__objects_3) \
    119         concurrency/CtxSwitch-@MACHINE_TYPE@.$(OBJEXT) \
    120         concurrency/libcfa_a-invoke.$(OBJEXT)
    121 am_libcfa_a_OBJECTS = $(am__objects_4)
     136        $(am__objects_5)
     137@BUILD_CONCURRENCY_TRUE@am__objects_7 = concurrency/CtxSwitch-@MACHINE_TYPE@.$(OBJEXT) \
     138@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_a-invoke.$(OBJEXT)
     139am__objects_8 = libcfa_a-libcfa-prelude.$(OBJEXT) $(am__objects_6) \
     140        $(am__objects_7)
     141am_libcfa_a_OBJECTS = $(am__objects_8)
    122142libcfa_a_OBJECTS = $(am_libcfa_a_OBJECTS)
    123143DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
     
    147167am__v_GEN_0 = @echo "  GEN   " $@;
    148168SOURCES = $(libcfa_d_a_SOURCES) $(libcfa_a_SOURCES)
    149 DIST_SOURCES = $(libcfa_d_a_SOURCES) $(libcfa_a_SOURCES)
     169DIST_SOURCES = $(am__libcfa_d_a_SOURCES_DIST) \
     170        $(am__libcfa_a_SOURCES_DIST)
     171am__nobase_cfa_include_HEADERS_DIST = limits stdlib math iostream \
     172        fstream iterator rational assert containers/vector \
     173        concurrency/coroutines concurrency/threads concurrency/kernel \
     174        ${shell echo stdhdr/*} concurrency/invoke.h
    150175HEADERS = $(nobase_cfa_include_HEADERS)
    151176ETAGS = etags
     
    276301EXTRA_FLAGS = -g -Wall -Wno-unused-function -I${abs_top_srcdir}/src/libcfa/libhdr -imacros libcfa-prelude.c @CFA_FLAGS@
    277302AM_CCASFLAGS = @CFA_FLAGS@
    278 headers = limits stdlib math iostream fstream iterator rational assert containers/vector concurrency/coroutines concurrency/threads concurrency/kernel
    279 runtimehdrs = concurrency
     303headers = limits stdlib math iostream fstream iterator rational assert \
     304        $(am__append_3)
    280305libobjs = ${headers:=.o}
    281 libsrc = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c
     306libsrc = libcfa-prelude.c ${headers:=.c} $(am__append_4)
    282307libcfa_a_SOURCES = ${libsrc}
    283308libcfa_a_CFLAGS = -nodebug -O2
Note: See TracChangeset for help on using the changeset viewer.