Changeset 3ca540f for src/libcfa/Makefile.am

Timestamp:

Dec 1, 2017, 2:55:41 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

a40d503

Parents:

882ad37 (diff), 5da9d6a (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' into with-statement

File:

• src/libcfa/Makefile.am (modified) (2 diffs)

src/libcfa/Makefile.am

@@ -55 +55 @@
 
 libobjs = ${headers:=.o}
-libsrc = libcfa-prelude.c interpose.c libhdr/libdebug.c ${headers:=.c} \
+libsrc = libcfa-prelude.c interpose.c bits/debug.c ${headers:=.c} \
          assert.c exception.c virtual.c
 
@@ -100 +100 @@
         math                            \
         gmp                             \
+        bits/align.h            \
         bits/containers.h               \
         bits/defs.h             \
+        bits/debug.h            \
         bits/locks.h            \
-        concurrency/invoke.h    \
-        libhdr.h                        \
-        libhdr/libalign.h       \
-        libhdr/libdebug.h       \
-        libhdr/libtools.h
+        concurrency/invoke.h
 
 CLEANFILES = libcfa-prelude.c