Changeset 50b7e8c for doc/generic_types/evaluation/Makefile

Timestamp:

Apr 12, 2017, 10:15:20 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

19518e8

Parents:

549950c (diff), 0d10090 (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' of plg2:software/cfa/cfa-cc

File:

• doc/generic_types/evaluation/Makefile (modified) (4 diffs)

doc/generic_types/evaluation/Makefile ¶

@@ -1 +1 @@
 CFA = my-cfa
 DEPFLAGS = -MMD -MP
-CFLAGS = -O2 -flto
+CFLAGS = -O2
+ifdef N
+CFLAGS += -DN=$(N)
+endif
 CXXFLAGS = $(CFLAGS) --std=c++14
 
@@ -25 +28 @@
         $(COMPILE.cfa) $(OUTPUT_OPTION) -c $<
 
-COBJS = c-stack.o c-pair.o
+COBJS = c-stack.o c-pair.o c-print.o
 CPPOBJS = 
 CPPVOBJS = cpp-vstack.o
-CFAOBJS = cfa-stack.o cfa-pair.o
+CFAOBJS = cfa-stack.o cfa-pair.o cfa-print.o
 
 c-bench: c-bench.c c-bench.d $(COBJS)
@@ -65 +68 @@
         @echo '## Cforall ##'
         @/usr/bin/time -f 'max_memory:\t %M kilobytes' ./cfa-bench
-        @printf 'source_size:\t%8d lines\n' `cat cfa-bench.c bench.h cfa-stack.h cfa-stack.c | wc -l`
+        @printf 'source_size:\t%8d lines\n' `cat cfa-bench.c bench.h cfa-stack.h cfa-stack.c cfa-print.h cfa-print.c | wc -l`
         @printf 'binary_size:\t%8d bytes\n' `stat -c %s cfa-bench`
 
@@ -72 +75 @@
         @echo '## C++ ##'
         @/usr/bin/time -f 'max_memory:\t %M kilobytes' ./cpp-bench
-        @printf 'source_size:\t%8d lines\n' `cat cpp-bench.cpp bench.hpp cpp-stack.hpp | wc -l`
+        @printf 'source_size:\t%8d lines\n' `cat cpp-bench.cpp bench.hpp cpp-stack.hpp cpp-print.hpp | wc -l`
         @printf 'binary_size:\t%8d bytes\n' `stat -c %s cpp-bench`