Changeset d63eeb0 for src/libcfa/Makefile.am

Timestamp:

Feb 9, 2016, 3:25:05 PM (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:

7528ba1

Parents:

771b3c3 (diff), bd85400 (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/CodeGen/CodeGenerator.cc
src/GenPoly/Box.cc
src/Makefile.in
src/Parser/ParseNode.h
src/Parser/parser.cc
src/Parser/parser.yy
src/SymTab/Validate.cc
src/SynTree/Initializer.h
src/SynTree/ObjectDecl.cc
src/SynTree/Visitor.h
src/main.cc

File:

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

src/libcfa/Makefile.am

@@ -6 +6 @@
 ## file "LICENCE" distributed with Cforall.
 ##
-## Makefile.am -- 
+## Makefile.am --
 ##
 ## Author           : Peter A. Buhr
 ## Created On       : Sun May 31 08:54:01 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Wed Dec 16 22:58:17 2015
-## Update Count     : 9
+## Last Modified On : Wed Feb  3 11:19:35 2016
+## Update Count     : 117
 ###############################################################################
 
-libcfa_a_SOURCES = libcfa-prelude.c
 lib_LIBRARIES = libcfa.a
 
@@ -41 +40 @@
 prototypes.awk :
 
-MAINTAINERCLEANFILES = ${srcdir}/libcfa-prelude.c
+MAINTAINERCLEANFILES = ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
+
+#--------------------------------------------------
 
 libcfa-prelude.c : ${srcdir}/prelude.cf
-        ../cfa-cpp -l ${srcdir}/prelude.cf $@  # use src/cfa-cpp as not in lib until after install
+        ${abs_top_srcdir}/src/driver/cfa-cpp -l ${srcdir}/prelude.cf $@  # use src/cfa-cpp as not in lib until after install
 
 libcfa-prelude.o : libcfa-prelude.c
-        ${BACKEND_CC} -c -o $@ $<
+        @BACKEND_CC@ -c -o $@ $<
+
+CFLAGS = -g -Wall -Wno-unused-function -B${abs_top_srcdir}/src/driver -XCFA -t  # TEMPORARY: does not build with -O2
+CC = ${abs_top_srcdir}/src/driver/cfa
+
+# extension-less header files are overridden by default make rules => explicitly override rule
+% : %.c
+        true
+
+.c.o : ${abs_top_srcdir}/src/driver/cfa-cpp
+        ${CC} ${CFLAGS} -c -o $@ $<
+
+libs = # stdlib iostream fstream iterator  # temporarily getting rid of these until ctor/dtor autogen works
+libcfa_a_SOURCES = libcfa-prelude.c ${libs:=.c}
+
+cheaders = bfd bfdlink demangle dialog evdns evhttp evrpc expat fcntl form gcrypt math
+cfaheaders = limits
+include_HEADERS = ${cheaders:=.h} ${libs} ${cfaheaders}
+
+MAINTAINERCLEANFILES += ${includedir}/*