Changeset 170235d


Ignore:
Timestamp:
Jun 1, 2020, 2:24:46 PM (16 months ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
arm-eh, jacob/cs343-translation, master, new-ast, new-ast-unique-expr
Children:
3d46f01
Parents:
cb95634
Message:

reposition include files in libcfa/src/Makefile.am to get them copied to "include" directory

Location:
libcfa/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • libcfa/src/Makefile.am

    rcb95634 r170235d  
    1111## Created On       : Sun May 31 08:54:01 2015
    1212## Last Modified By : Peter A. Buhr
    13 ## Last Modified On : Tue May 26 14:03:18 2020
    14 ## Update Count     : 244
     13## Last Modified On : Mon Jun  1 13:35:33 2020
     14## Update Count     : 248
    1515###############################################################################
    1616
     
    3939#----------------------------------------------------------------------------------------------------------------
    4040if BUILDLIB
    41 headers_nosrc = bitmanip.hfa math.hfa gmp.hfa time_t.hfa clock.hfa \
    42                 bits/align.hfa bits/containers.hfa bits/defs.hfa bits/debug.hfa bits/locks.hfa containers/list.hfa
     41headers_nosrc = bitmanip.hfa exception.hfa math.hfa gmp.hfa time_t.hfa clock.hfa \
     42                bits/align.hfa bits/containers.hfa bits/defs.hfa bits/debug.hfa bits/locks.hfa containers/list.hfa containers/stackLockFree.hfa
    4343headers = common.hfa fstream.hfa heap.hfa iostream.hfa iterator.hfa limits.hfa rational.hfa time.hfa stdlib.hfa \
    44                 containers/maybe.hfa containers/pair.hfa containers/result.hfa containers/stackLockFree.hfa containers/vector.hfa
     44                containers/maybe.hfa containers/pair.hfa containers/result.hfa containers/vector.hfa
    4545
    46 libsrc = startup.cfa interpose.cfa bits/debug.cfa assert.cfa exception.c virtual.c heap.cfa ${headers:.hfa=.cfa}
     46libsrc = startup.cfa interpose.cfa bits/debug.cfa assert.cfa exception.c virtual.c ${headers:.hfa=.cfa}
    4747
    4848# not all platforms support concurrency, add option do disable it
  • libcfa/src/Makefile.in

    rcb95634 r170235d  
    139139libcfa_la_LIBADD =
    140140am__libcfa_la_SOURCES_DIST = prelude.cfa startup.cfa interpose.cfa \
    141         bits/debug.cfa assert.cfa exception.c virtual.c heap.cfa \
    142         fstream.cfa iostream.cfa iterator.cfa limits.cfa rational.cfa \
    143         time.cfa stdlib.cfa common.cfa containers/maybe.cfa \
     141        bits/debug.cfa assert.cfa exception.c virtual.c common.cfa \
     142        fstream.cfa heap.cfa iostream.cfa iterator.cfa limits.cfa \
     143        rational.cfa time.cfa stdlib.cfa containers/maybe.cfa \
    144144        containers/pair.cfa containers/result.cfa \
    145145        containers/vector.cfa
    146146am__dirstamp = $(am__leading_dot)dirstamp
    147 @BUILDLIB_TRUE@am__objects_1 = fstream.lo iostream.lo iterator.lo \
    148 @BUILDLIB_TRUE@ limits.lo rational.lo time.lo stdlib.lo \
    149 @BUILDLIB_TRUE@ common.lo containers/maybe.lo \
     147@BUILDLIB_TRUE@am__objects_1 = common.lo fstream.lo heap.lo \
     148@BUILDLIB_TRUE@ iostream.lo iterator.lo limits.lo rational.lo \
     149@BUILDLIB_TRUE@ time.lo stdlib.lo containers/maybe.lo \
    150150@BUILDLIB_TRUE@ containers/pair.lo containers/result.lo \
    151151@BUILDLIB_TRUE@ containers/vector.lo
    152152@BUILDLIB_TRUE@am__objects_2 = startup.lo interpose.lo bits/debug.lo \
    153 @BUILDLIB_TRUE@ assert.lo exception.lo virtual.lo heap.lo \
     153@BUILDLIB_TRUE@ assert.lo exception.lo virtual.lo \
    154154@BUILDLIB_TRUE@ $(am__objects_1)
    155155am_libcfa_la_OBJECTS = prelude.lo $(am__objects_2)
     
    236236  esac
    237237am__nobase_cfa_include_HEADERS_DIST = $(shell find $(srcdir)/stdhdr \
    238         -type f -printf "%p ") fstream.hfa iostream.hfa iterator.hfa \
    239         limits.hfa rational.hfa time.hfa stdlib.hfa common.hfa \
    240         containers/maybe.hfa containers/pair.hfa containers/result.hfa \
    241         containers/vector.hfa bitmanip.hfa math.hfa gmp.hfa time_t.hfa \
    242         clock.hfa bits/align.hfa bits/containers.hfa bits/defs.hfa \
     238        -type f -printf "%p ") common.hfa fstream.hfa heap.hfa \
     239        iostream.hfa iterator.hfa limits.hfa rational.hfa time.hfa \
     240        stdlib.hfa containers/maybe.hfa containers/pair.hfa \
     241        containers/result.hfa containers/vector.hfa bitmanip.hfa \
     242        exception.hfa math.hfa gmp.hfa time_t.hfa clock.hfa \
     243        bits/align.hfa bits/containers.hfa bits/defs.hfa \
    243244        bits/debug.hfa bits/locks.hfa containers/list.hfa \
    244         concurrency/coroutine.hfa concurrency/thread.hfa \
    245         concurrency/kernel.hfa concurrency/monitor.hfa \
    246         concurrency/mutex.hfa concurrency/invoke.h
     245        containers/stackLockFree.hfa concurrency/coroutine.hfa \
     246        concurrency/thread.hfa concurrency/kernel.hfa \
     247        concurrency/monitor.hfa concurrency/mutex.hfa \
     248        concurrency/invoke.h
    247249HEADERS = $(nobase_cfa_include_HEADERS)
    248250am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
     
    464466
    465467#----------------------------------------------------------------------------------------------------------------
    466 @BUILDLIB_TRUE@headers_nosrc = bitmanip.hfa math.hfa gmp.hfa time_t.hfa clock.hfa \
    467 @BUILDLIB_TRUE@         bits/align.hfa bits/containers.hfa bits/defs.hfa bits/debug.hfa bits/locks.hfa containers/list.hfa
     468@BUILDLIB_TRUE@headers_nosrc = bitmanip.hfa exception.hfa math.hfa gmp.hfa time_t.hfa clock.hfa \
     469@BUILDLIB_TRUE@         bits/align.hfa bits/containers.hfa bits/defs.hfa bits/debug.hfa bits/locks.hfa containers/list.hfa containers/stackLockFree.hfa
    468470
    469471@BUILDLIB_FALSE@headers =
    470 @BUILDLIB_TRUE@headers = fstream.hfa iostream.hfa iterator.hfa limits.hfa rational.hfa time.hfa stdlib.hfa common.hfa \
     472@BUILDLIB_TRUE@headers = common.hfa fstream.hfa heap.hfa iostream.hfa iterator.hfa limits.hfa rational.hfa time.hfa stdlib.hfa \
    471473@BUILDLIB_TRUE@         containers/maybe.hfa containers/pair.hfa containers/result.hfa containers/vector.hfa
    472474
    473475@BUILDLIB_FALSE@libsrc =
    474 @BUILDLIB_TRUE@libsrc = startup.cfa interpose.cfa bits/debug.cfa assert.cfa exception.c virtual.c heap.cfa ${headers:.hfa=.cfa}
     476@BUILDLIB_TRUE@libsrc = startup.cfa interpose.cfa bits/debug.cfa assert.cfa exception.c virtual.c ${headers:.hfa=.cfa}
    475477@BUILDLIB_FALSE@thread_headers_nosrc =
    476478
Note: See TracChangeset for help on using the changeset viewer.