Ignore:
Timestamp:
Dec 13, 2016, 3:15:11 PM (8 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:
37efaf56
Parents:
58dd019 (diff), 0edebf8 (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.am

    r58dd019 r04c8bba  
    1818AUTOMAKE_OPTIONS = subdir-objects
    1919
    20 lib_LIBRARIES = libcfa.a
     20lib_LIBRARIES =
     21
     22if BUILD_RELEASE
     23lib_LIBRARIES += libcfa.a
     24endif
     25
     26if BUILD_DEBUG
     27lib_LIBRARIES += libcfa-d.a
     28endif
    2129
    2230# put into lib for now
     
    7886${libobjs} : ${abs_top_srcdir}/src/driver/cfa-cpp ${cfalib_DATA} # add dependency to cfa-cpp so all libraries are rebuilt with new translator
    7987
    80 libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c
     88libsrc = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c
     89
     90libcfa_a_SOURCES = ${libsrc}
     91
     92libcfa_d_a_SOURCES = ${libsrc}
    8193
    8294stdhdr = ${shell echo stdhdr/*}
Note: See TracChangeset for help on using the changeset viewer.