Changeset e054263f

Timestamp:

Jan 16, 2020, 4:13:59 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

aefb247

Parents:

7d61d1c

Message:

Changed makefiles to correctly install vector headers

Location:

libcfa/src

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (8 diffs)

libcfa/src/Makefile.am

@@ -41 +41 @@
 headers_nosrc = math.hfa gmp.hfa time_t.hfa bits/align.hfa bits/containers.hfa bits/defs.hfa bits/debug.hfa bits/locks.hfa
 headers = fstream.hfa iostream.hfa iterator.hfa limits.hfa rational.hfa time.hfa stdlib.hfa common.hfa \
-          containers/maybe.hfa containers/pair.hfa containers/result.hfa containers/vector.hfa
+          containers/maybe.hfa containers/pair.hfa containers/result.hfa containers/vector.hfa \
+          vec/vec.hfa vec/vec2.hfa vec/vec3.hfa vec/vec4.hfa
 
 libsrc = startup.cfa interpose.cfa bits/debug.cfa assert.cfa exception.c virtual.c heap.cfa ${headers:.hfa=.cfa}

libcfa/src/Makefile.in

@@ -142 +142 @@
         time.cfa stdlib.cfa common.cfa containers/maybe.cfa \
         containers/pair.cfa containers/result.cfa \
-        containers/vector.cfa
+        containers/vector.cfa vec/vec.cfa vec/vec2.cfa vec/vec3.cfa \
+        vec/vec4.cfa
 am__dirstamp = $(am__leading_dot)dirstamp
 @BUILDLIB_TRUE@am__objects_1 = fstream.lo iostream.lo iterator.lo \
@@ -148 +149 @@
 @BUILDLIB_TRUE@ common.lo containers/maybe.lo \
 @BUILDLIB_TRUE@ containers/pair.lo containers/result.lo \
-@BUILDLIB_TRUE@ containers/vector.lo
+@BUILDLIB_TRUE@ containers/vector.lo vec/vec.lo vec/vec2.lo \
+@BUILDLIB_TRUE@ vec/vec3.lo vec/vec4.lo
 @BUILDLIB_TRUE@am__objects_2 = startup.lo interpose.lo bits/debug.lo \
 @BUILDLIB_TRUE@ assert.lo exception.lo virtual.lo heap.lo \
@@ -237 +239 @@
         limits.hfa rational.hfa time.hfa stdlib.hfa common.hfa \
         containers/maybe.hfa containers/pair.hfa containers/result.hfa \
-        containers/vector.hfa math.hfa gmp.hfa time_t.hfa \
-        bits/align.hfa bits/containers.hfa bits/defs.hfa \
-        bits/debug.hfa bits/locks.hfa concurrency/coroutine.hfa \
+        containers/vector.hfa vec/vec.hfa vec/vec2.hfa vec/vec3.hfa \
+        vec/vec4.hfa math.hfa gmp.hfa time_t.hfa bits/align.hfa \
+        bits/containers.hfa bits/defs.hfa bits/debug.hfa \
+        bits/locks.hfa concurrency/coroutine.hfa \
         concurrency/thread.hfa concurrency/kernel.hfa \
         concurrency/monitor.hfa concurrency/mutex.hfa \
@@ -452 +455 @@
 @BUILDLIB_FALSE@headers = 
 @BUILDLIB_TRUE@headers = fstream.hfa iostream.hfa iterator.hfa limits.hfa rational.hfa time.hfa stdlib.hfa common.hfa \
-@BUILDLIB_TRUE@   containers/maybe.hfa containers/pair.hfa containers/result.hfa containers/vector.hfa
+@BUILDLIB_TRUE@   containers/maybe.hfa containers/pair.hfa containers/result.hfa containers/vector.hfa \
+@BUILDLIB_TRUE@   vec/vec.hfa vec/vec2.hfa vec/vec3.hfa vec/vec4.hfa
 
 @BUILDLIB_FALSE@libsrc = 
@@ -582 +586 @@
 containers/vector.lo: containers/$(am__dirstamp) \
         containers/$(DEPDIR)/$(am__dirstamp)
+vec/$(am__dirstamp):
+        @$(MKDIR_P) vec
+        @: > vec/$(am__dirstamp)
+vec/$(DEPDIR)/$(am__dirstamp):
+        @$(MKDIR_P) vec/$(DEPDIR)
+        @: > vec/$(DEPDIR)/$(am__dirstamp)
+vec/vec.lo: vec/$(am__dirstamp) vec/$(DEPDIR)/$(am__dirstamp)
+vec/vec2.lo: vec/$(am__dirstamp) vec/$(DEPDIR)/$(am__dirstamp)
+vec/vec3.lo: vec/$(am__dirstamp) vec/$(DEPDIR)/$(am__dirstamp)
+vec/vec4.lo: vec/$(am__dirstamp) vec/$(DEPDIR)/$(am__dirstamp)
 
 libcfa.la: $(libcfa_la_OBJECTS) $(libcfa_la_DEPENDENCIES) $(EXTRA_libcfa_la_DEPENDENCIES) 
@@ -621 +635 @@
         -rm -f containers/*.$(OBJEXT)
         -rm -f containers/*.lo
+        -rm -f vec/*.$(OBJEXT)
+        -rm -f vec/*.lo
 
 distclean-compile:
@@ -686 +702 @@
         -rm -rf concurrency/.libs concurrency/_libs
         -rm -rf containers/.libs containers/_libs
+        -rm -rf vec/.libs vec/_libs
 install-nobase_cfa_includeHEADERS: $(nobase_cfa_include_HEADERS)
         @$(NORMAL_INSTALL)
@@ -832 +849 @@
         -rm -f containers/$(DEPDIR)/$(am__dirstamp)
         -rm -f containers/$(am__dirstamp)
+        -rm -f vec/$(DEPDIR)/$(am__dirstamp)
+        -rm -f vec/$(am__dirstamp)
 
 maintainer-clean-generic: