Changeset e054263f


Ignore:
Timestamp:
Jan 16, 2020, 4:13:59 PM (20 months ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, jacob/cs343-translation, master, new-ast-unique-expr
Children:
aefb247
Parents:
7d61d1c
Message:

Changed makefiles to correctly install vector headers

Location:
libcfa/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • libcfa/src/Makefile.am

    r7d61d1c re054263f  
    4141headers_nosrc = math.hfa gmp.hfa time_t.hfa bits/align.hfa bits/containers.hfa bits/defs.hfa bits/debug.hfa bits/locks.hfa
    4242headers = fstream.hfa iostream.hfa iterator.hfa limits.hfa rational.hfa time.hfa stdlib.hfa common.hfa \
    43           containers/maybe.hfa containers/pair.hfa containers/result.hfa containers/vector.hfa
     43          containers/maybe.hfa containers/pair.hfa containers/result.hfa containers/vector.hfa \
     44          vec/vec.hfa vec/vec2.hfa vec/vec3.hfa vec/vec4.hfa
    4445
    4546libsrc = startup.cfa interpose.cfa bits/debug.cfa assert.cfa exception.c virtual.c heap.cfa ${headers:.hfa=.cfa}
  • libcfa/src/Makefile.in

    r7d61d1c re054263f  
    142142        time.cfa stdlib.cfa common.cfa containers/maybe.cfa \
    143143        containers/pair.cfa containers/result.cfa \
    144         containers/vector.cfa
     144        containers/vector.cfa vec/vec.cfa vec/vec2.cfa vec/vec3.cfa \
     145        vec/vec4.cfa
    145146am__dirstamp = $(am__leading_dot)dirstamp
    146147@BUILDLIB_TRUE@am__objects_1 = fstream.lo iostream.lo iterator.lo \
     
    148149@BUILDLIB_TRUE@ common.lo containers/maybe.lo \
    149150@BUILDLIB_TRUE@ containers/pair.lo containers/result.lo \
    150 @BUILDLIB_TRUE@ containers/vector.lo
     151@BUILDLIB_TRUE@ containers/vector.lo vec/vec.lo vec/vec2.lo \
     152@BUILDLIB_TRUE@ vec/vec3.lo vec/vec4.lo
    151153@BUILDLIB_TRUE@am__objects_2 = startup.lo interpose.lo bits/debug.lo \
    152154@BUILDLIB_TRUE@ assert.lo exception.lo virtual.lo heap.lo \
     
    237239        limits.hfa rational.hfa time.hfa stdlib.hfa common.hfa \
    238240        containers/maybe.hfa containers/pair.hfa containers/result.hfa \
    239         containers/vector.hfa math.hfa gmp.hfa time_t.hfa \
    240         bits/align.hfa bits/containers.hfa bits/defs.hfa \
    241         bits/debug.hfa bits/locks.hfa concurrency/coroutine.hfa \
     241        containers/vector.hfa vec/vec.hfa vec/vec2.hfa vec/vec3.hfa \
     242        vec/vec4.hfa math.hfa gmp.hfa time_t.hfa bits/align.hfa \
     243        bits/containers.hfa bits/defs.hfa bits/debug.hfa \
     244        bits/locks.hfa concurrency/coroutine.hfa \
    242245        concurrency/thread.hfa concurrency/kernel.hfa \
    243246        concurrency/monitor.hfa concurrency/mutex.hfa \
     
    452455@BUILDLIB_FALSE@headers =
    453456@BUILDLIB_TRUE@headers = fstream.hfa iostream.hfa iterator.hfa limits.hfa rational.hfa time.hfa stdlib.hfa common.hfa \
    454 @BUILDLIB_TRUE@   containers/maybe.hfa containers/pair.hfa containers/result.hfa containers/vector.hfa
     457@BUILDLIB_TRUE@   containers/maybe.hfa containers/pair.hfa containers/result.hfa containers/vector.hfa \
     458@BUILDLIB_TRUE@   vec/vec.hfa vec/vec2.hfa vec/vec3.hfa vec/vec4.hfa
    455459
    456460@BUILDLIB_FALSE@libsrc =
     
    582586containers/vector.lo: containers/$(am__dirstamp) \
    583587        containers/$(DEPDIR)/$(am__dirstamp)
     588vec/$(am__dirstamp):
     589        @$(MKDIR_P) vec
     590        @: > vec/$(am__dirstamp)
     591vec/$(DEPDIR)/$(am__dirstamp):
     592        @$(MKDIR_P) vec/$(DEPDIR)
     593        @: > vec/$(DEPDIR)/$(am__dirstamp)
     594vec/vec.lo: vec/$(am__dirstamp) vec/$(DEPDIR)/$(am__dirstamp)
     595vec/vec2.lo: vec/$(am__dirstamp) vec/$(DEPDIR)/$(am__dirstamp)
     596vec/vec3.lo: vec/$(am__dirstamp) vec/$(DEPDIR)/$(am__dirstamp)
     597vec/vec4.lo: vec/$(am__dirstamp) vec/$(DEPDIR)/$(am__dirstamp)
    584598
    585599libcfa.la: $(libcfa_la_OBJECTS) $(libcfa_la_DEPENDENCIES) $(EXTRA_libcfa_la_DEPENDENCIES)
     
    621635        -rm -f containers/*.$(OBJEXT)
    622636        -rm -f containers/*.lo
     637        -rm -f vec/*.$(OBJEXT)
     638        -rm -f vec/*.lo
    623639
    624640distclean-compile:
     
    686702        -rm -rf concurrency/.libs concurrency/_libs
    687703        -rm -rf containers/.libs containers/_libs
     704        -rm -rf vec/.libs vec/_libs
    688705install-nobase_cfa_includeHEADERS: $(nobase_cfa_include_HEADERS)
    689706        @$(NORMAL_INSTALL)
     
    832849        -rm -f containers/$(DEPDIR)/$(am__dirstamp)
    833850        -rm -f containers/$(am__dirstamp)
     851        -rm -f vec/$(DEPDIR)/$(am__dirstamp)
     852        -rm -f vec/$(am__dirstamp)
    834853
    835854maintainer-clean-generic:
Note: See TracChangeset for help on using the changeset viewer.