Changeset be945ac for src/libcfa/Makefile.am

Timestamp:

Jun 2, 2016, 11:51:07 AM (8 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:

2edd5502

Parents:

f1b1e4c (diff), 4df85197 (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 ctor

Conflicts:

src/SymTab/Validate.cc

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 : Tue Apr 19 22:30:17 2016
-## Update Count     : 124
+## Last Modified On : Tue May 31 13:24:15 2016
+## Update Count     : 141
 ###############################################################################
 
@@ -53 +53 @@
 CC = ${abs_top_srcdir}/src/driver/cfa
 
-# extension-less header files are overridden by default make rules => explicitly override rule
-% : %.c
-        true
+headers = limits stdlib math iostream fstream iterator rational
+.SECONDARY : ${headers}                                 # stop implicit '.o' rules from removing extensionless headers
 
-.c.o : ${abs_top_srcdir}/src/driver/cfa-cpp
-        ${CC} ${CFLAGS} -c -o $@ $<
+libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c}
 
-libs = limits stdlib math iostream fstream iterator rational
-libcfa_a_SOURCES = libcfa-prelude.c ${libs:=.c}
-
-cheaders = # expat
-cfaheaders = # limits
-include_HEADERS = ${cheaders:=.h} ${libs} ${cfaheaders}
+include_HEADERS = ${headers}
 
 CLEANFILES = libcfa-prelude.c