- Timestamp:
- Mar 6, 2017, 8:53:48 PM (8 years ago)
- 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:
- 7fe2498
- Parents:
- c443d1d (diff), 3f80888 (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. - Location:
- src
- Files:
-
- 18 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified src/Makefile.am ¶
rc443d1d r2988eeb 38 38 39 39 # put into lib for now 40 cfa_cpplibdir = ${ libdir}40 cfa_cpplibdir = ${CFA_LIBDIR} 41 41 cfa_cpplib_PROGRAMS = driver/cfa-cpp 42 42 driver_cfa_cpp_SOURCES = ${SRC} -
TabularUnified src/Makefile.in ¶
rc443d1d r2988eeb 276 276 CFA_INCDIR = @CFA_INCDIR@ 277 277 CFA_LIBDIR = @CFA_LIBDIR@ 278 CFA_NAME = @CFA_NAME@ 278 279 CFA_PREFIX = @CFA_PREFIX@ 279 280 CFLAGS = @CFLAGS@ … … 436 437 437 438 # put into lib for now 438 cfa_cpplibdir = ${ libdir}439 cfa_cpplibdir = ${CFA_LIBDIR} 439 440 driver_cfa_cpp_SOURCES = ${SRC} 440 441 driver_cfa_cpp_LDADD = ${LEXLIB} -ldl # yywrap -
TabularUnified src/benchmark/Makefile.am ¶
rc443d1d r2988eeb 18 18 CFLAGS = 19 19 AM_CFLAGS = -g -Wall -Wno-unused-function -O2 20 CC = @CFA_BINDIR@/ cfa20 CC = @CFA_BINDIR@/@CFA_NAME@ 21 21 22 22 noinst_PROGRAMS = bench ctxswitch-coroutine ctxswitch-thread -
TabularUnified src/benchmark/Makefile.in ¶
rc443d1d r2988eeb 94 94 AWK = @AWK@ 95 95 BACKEND_CC = @BACKEND_CC@ 96 CC = @CFA_BINDIR@/ cfa96 CC = @CFA_BINDIR@/@CFA_NAME@ 97 97 CCAS = @CCAS@ 98 98 CCASDEPMODE = @CCASDEPMODE@ … … 104 104 CFA_INCDIR = @CFA_INCDIR@ 105 105 CFA_LIBDIR = @CFA_LIBDIR@ 106 CFA_NAME = @CFA_NAME@ 106 107 CFA_PREFIX = @CFA_PREFIX@ 107 108 -
TabularUnified src/driver/Makefile.am ¶
rc443d1d r2988eeb 32 32 33 33 # put into lib for now 34 cc1libdir = ${ libdir}34 cc1libdir = ${CFA_LIBDIR} 35 35 cc1lib_PROGRAMS = cc1 36 36 cc1_SOURCES = cc1.cc -
TabularUnified src/driver/Makefile.in ¶
rc443d1d r2988eeb 106 106 CFA_INCDIR = @CFA_INCDIR@ 107 107 CFA_LIBDIR = @CFA_LIBDIR@ 108 CFA_NAME = @CFA_NAME@ 108 109 CFA_PREFIX = @CFA_PREFIX@ 109 110 CFLAGS = @CFLAGS@ … … 212 213 213 214 # put into lib for now 214 cc1libdir = ${ libdir}215 cc1libdir = ${CFA_LIBDIR} 215 216 cc1_SOURCES = cc1.cc 216 217 MAINTAINERCLEANFILES = @CFA_PREFIX@/bin/${bin_PROGRAMS} @CFA_PREFIX@/lib/${cc1lib_PROGRAMS} -
TabularUnified src/examples/Makefile.am ¶
rc443d1d r2988eeb 18 18 CFLAGS = 19 19 AM_CFLAGS = -g -Wall -Wno-unused-function -O2 20 CC = @CFA_BINDIR@/ cfa20 CC = @CFA_BINDIR@/@CFA_NAME@ 21 21 22 22 noinst_PROGRAMS = fstream_test vector_test avl_test Bench # build but do not install -
TabularUnified src/examples/Makefile.in ¶
rc443d1d r2988eeb 105 105 AWK = @AWK@ 106 106 BACKEND_CC = @BACKEND_CC@ 107 CC = @CFA_BINDIR@/ cfa107 CC = @CFA_BINDIR@/@CFA_NAME@ 108 108 CCAS = @CCAS@ 109 109 CCASDEPMODE = @CCASDEPMODE@ … … 115 115 CFA_INCDIR = @CFA_INCDIR@ 116 116 CFA_LIBDIR = @CFA_LIBDIR@ 117 CFA_NAME = @CFA_NAME@ 117 118 CFA_PREFIX = @CFA_PREFIX@ 118 119 -
TabularUnified src/libcfa/Makefile.am ¶
rc443d1d r2988eeb 18 18 AUTOMAKE_OPTIONS = subdir-objects 19 19 20 libdir = ${CFA_LIBDIR} 20 21 lib_LIBRARIES = 21 22 … … 67 68 ${libobjs} : ${abs_top_srcdir}/src/driver/cfa-cpp ${cfalib_DATA} # add dependency to cfa-cpp so all libraries are rebuilt with new translator 68 69 69 70 70 libcfa_a_SOURCES = ${libsrc} 71 71 libcfa_a_CFLAGS = -nodebug -O2 … … 75 75 stdhdr = ${shell echo stdhdr/*} 76 76 77 cfa_includedir = $( includedir)/cfa77 cfa_includedir = $(CFA_INCDIR) 78 78 nobase_cfa_include_HEADERS = ${headers} ${stdhdr} concurrency/invoke.h 79 79 … … 81 81 82 82 maintainer-clean-local: 83 -rm -rf ${includedir}/* 83 -rm -rf ${includedir}/* ${libdir}/* -
TabularUnified src/libcfa/Makefile.in ¶
rc443d1d r2988eeb 201 201 CFA_INCDIR = @CFA_INCDIR@ 202 202 CFA_LIBDIR = @CFA_LIBDIR@ 203 CFA_NAME = @CFA_NAME@ 203 204 CFA_PREFIX = @CFA_PREFIX@ 204 205 CFLAGS = -quiet -no-include-stdhdr -XCFA -t -B${abs_top_srcdir}/src/driver ${EXTRA_FLAGS} … … 281 282 infodir = @infodir@ 282 283 install_sh = @install_sh@ 283 libdir = @libdir@284 libdir = ${CFA_LIBDIR} 284 285 libexecdir = @libexecdir@ 285 286 localedir = @localedir@ … … 315 316 libcfa_d_a_CFLAGS = -debug -O0 316 317 stdhdr = ${shell echo stdhdr/*} 317 cfa_includedir = $( includedir)/cfa318 cfa_includedir = $(CFA_INCDIR) 318 319 nobase_cfa_include_HEADERS = ${headers} ${stdhdr} concurrency/invoke.h 319 320 CLEANFILES = libcfa-prelude.c … … 1160 1161 1161 1162 maintainer-clean-local: 1162 -rm -rf ${includedir}/* 1163 -rm -rf ${includedir}/* ${libdir}/* 1163 1164 1164 1165 # Tell versions [3.59,3.63) of GNU make to not export all variables. -
TabularUnified src/libcfa/iostream ¶
rc443d1d r2988eeb 10 10 // Created On : Wed May 27 17:56:53 2015 11 11 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Mon Mar 6 17:48:01201713 // Update Count : 9 712 // Last Modified On : Mon Mar 6 20:51:35 2017 13 // Update Count : 98 14 14 // 15 15 -
TabularUnified src/libcfa/iostream.c ¶
rc443d1d r2988eeb 10 10 // Created On : Wed May 27 17:56:53 2015 11 11 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Mon Mar 6 17:48:05201713 // Update Count : 31 212 // Last Modified On : Mon Mar 6 20:52:02 2017 13 // Update Count : 313 14 14 // 15 15 -
TabularUnified src/libcfa/stdlib ¶
rc443d1d r2988eeb 10 10 // Created On : Thu Jan 28 17:12:35 2016 11 11 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Fri Feb 24 21:07:16201713 // Update Count : 10 112 // Last Modified On : Sat Mar 4 22:03:54 2017 13 // Update Count : 102 14 14 // 15 15 -
TabularUnified src/libcfa/stdlib.c ¶
rc443d1d r2988eeb 10 10 // Created On : Thu Jan 28 17:10:29 2016 11 11 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Fri Feb 24 21:08:11201713 // Update Count : 17 112 // Last Modified On : Sat Mar 4 22:02:22 2017 13 // Update Count : 172 14 14 // 15 15 -
TabularUnified src/prelude/Makefile.am ¶
rc443d1d r2988eeb 19 19 20 20 # put into lib for now 21 cfalibdir = ${ libdir}21 cfalibdir = ${CFA_LIBDIR} 22 22 cfalib_DATA = builtins.cf extras.cf prelude.cf bootloader.c 23 23 noinst_DATA = ../libcfa/libcfa-prelude.c -
TabularUnified src/prelude/Makefile.in ¶
rc443d1d r2988eeb 105 105 CFA_INCDIR = @CFA_INCDIR@ 106 106 CFA_LIBDIR = @CFA_LIBDIR@ 107 CFA_NAME = @CFA_NAME@ 107 108 CFA_PREFIX = @CFA_PREFIX@ 108 109 CFLAGS = @CFLAGS@ … … 209 210 210 211 # put into lib for now 211 cfalibdir = ${ libdir}212 cfalibdir = ${CFA_LIBDIR} 212 213 cfalib_DATA = builtins.cf extras.cf prelude.cf bootloader.c 213 214 noinst_DATA = ../libcfa/libcfa-prelude.c -
TabularUnified src/tests/Makefile.am ¶
rc443d1d r2988eeb 30 30 EXTRA_FLAGS = 31 31 CFLAGS = -g -Wall -Wno-unused-function @CFA_FLAGS@ ${EXTRA_FLAGS} 32 CC = @CFA_BINDIR@/ cfa32 CC = @CFA_BINDIR@/@CFA_NAME@ 33 33 34 34 .PHONY : list -
TabularUnified src/tests/Makefile.in ¶
rc443d1d r2988eeb 113 113 AWK = @AWK@ 114 114 BACKEND_CC = @BACKEND_CC@ 115 CC = @CFA_BINDIR@/ cfa115 CC = @CFA_BINDIR@/@CFA_NAME@ 116 116 CCAS = @CCAS@ 117 117 CCASDEPMODE = @CCASDEPMODE@ … … 123 123 CFA_INCDIR = @CFA_INCDIR@ 124 124 CFA_LIBDIR = @CFA_LIBDIR@ 125 CFA_NAME = @CFA_NAME@ 125 126 CFA_PREFIX = @CFA_PREFIX@ 126 127 CFLAGS = -g -Wall -Wno-unused-function @CFA_FLAGS@ ${EXTRA_FLAGS}
Note: See TracChangeset
for help on using the changeset viewer.