Changeset 083cf31 for src/libcfa/Makefile.am

Timestamp:

Jan 7, 2016, 11:28:48 AM (10 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

1e9d87b

Parents:

267cb3d (diff), de91427b (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 with master

File:

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

src/libcfa/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 08:54:01 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Thu Jun  4 22:49:16 2015
-## Update Count     : 7
+## Last Modified On : Wed Dec 16 22:58:17 2015
+## Update Count     : 9
 ###############################################################################
 
@@ -44 +44 @@
 
 libcfa-prelude.c : ${srcdir}/prelude.cf
-        ${libdir}/cfa-cpp -l ${srcdir}/prelude.cf $@
+        ../cfa-cpp -l ${srcdir}/prelude.cf $@  # use src/cfa-cpp as not in lib until after install
 
 libcfa-prelude.o : libcfa-prelude.c