Changes in / [944a90f:a4248de1]


Ignore:
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • Makefile.in

    r944a90f ra4248de1  
    250250AWK = @AWK@
    251251BACKEND_CC = @BACKEND_CC@               # C compiler used to compile Cforall programs, versus C++ compiler used to build cfa command
    252 BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    253 BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
    254252CC = @CC@
    255253CCAS = @CCAS@
    … …  
    257255CCASFLAGS = @CCASFLAGS@
    258256CCDEPMODE = @CCDEPMODE@
    259 CFACC = @CFACC@
    260 CFACPP = @CFACPP@
    261257CFA_BACKEND_CC = @CFA_BACKEND_CC@
    262258CFA_BINDIR = @CFA_BINDIR@
    … …  
    275271DEFS = @DEFS@
    276272DEPDIR = @DEPDIR@
    277 DRIVER_DIR = @DRIVER_DIR@
    278273ECHO_C = @ECHO_C@
    279274ECHO_N = @ECHO_N@

  • configure

    r944a90f ra4248de1  
    674674build_cpu
    675675build
    676 BUILD_IN_TREE_FLAGS
    677 BUILD_IN_TREE_FLAGS_NOLIB
    678 CFACPP
    679 CFACC
    680 DRIVER_DIR
    681676CFA_LIBDIR
    682677CFA_BINDIR
    … …  
    33803375
    33813376
    3382 # Create variables for commonly used targets
    3383 DRIVER_DIR='$(top_builddir)/src/driver'
    3384 CFACC=${DRIVER_DIR}/cfa
    3385 CFACPP=${DRIVER_DIR}/cfa-cpp
    3386 
    3387 
    3388 
    3389 
    3390 # Flag variables needed to build in tree
    3391 LIBCFA_SRC='$(top_srcdir)/src/libcfa'
    3392 LIBCFA_BUILD='$(top_builddir)/src/libcfa'
    3393 BUILD_IN_TREE_FLAGS_NOLIB="-XCFA -t -B${DRIVER_DIR}"
    3394 BUILD_IN_TREE_FLAGS="${BUILD_IN_TREE_FLAGS_NOLIB} -L${LIBCFA_BUILD} -I${LIBCFA_SRC} -I${LIBCFA_SRC}AM_CFLAGS/containers -I${LIBCFA_SRC}/concurrency -I${LIBCFA_SRC}/stdhdr"
    3395 
    3396 
    3397 
    33983377# Make sure we can run config.sub.
    33993378$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||

  • configure.ac

    r944a90f ra4248de1  
    170170AC_DEFINE_UNQUOTED(CFA_LIBDIR, "${cfa_libdir}", [Location of cc1 and cfa-cpp commands.])
    171171AC_SUBST(CFA_LIBDIR, ${cfa_libdir})
    172 
    173 # Create variables for commonly used targets
    174 DRIVER_DIR='$(top_builddir)/src/driver'
    175 CFACC=${DRIVER_DIR}/cfa
    176 CFACPP=${DRIVER_DIR}/cfa-cpp
    177 AC_SUBST(DRIVER_DIR)
    178 AC_SUBST(CFACC)
    179 AC_SUBST(CFACPP)
    180 
    181 # Flag variables needed to build in tree
    182 LIBCFA_SRC='$(top_srcdir)/src/libcfa'
    183 LIBCFA_BUILD='$(top_builddir)/src/libcfa'
    184 BUILD_IN_TREE_FLAGS_NOLIB="-XCFA -t -B${DRIVER_DIR}"
    185 BUILD_IN_TREE_FLAGS="${BUILD_IN_TREE_FLAGS_NOLIB} -L${LIBCFA_BUILD} -I${LIBCFA_SRC} -I${LIBCFA_SRC}AM_CFLAGS/containers -I${LIBCFA_SRC}/concurrency -I${LIBCFA_SRC}/stdhdr"
    186 AC_SUBST(BUILD_IN_TREE_FLAGS_NOLIB)
    187 AC_SUBST(BUILD_IN_TREE_FLAGS)
    188172
    189173AC_CANONICAL_BUILD

  • src/Makefile.am

    r944a90f ra4248de1  
    4040
    4141# put into lib for now
    42 cfa_cpplibdir = $(CFA_LIBDIR)
     42cfa_cpplibdir = ${CFA_LIBDIR}
    4343cfa_cpplib_PROGRAMS = driver/cfa-cpp
    44 driver_cfa_cpp_SOURCES = $(SRC)
     44driver_cfa_cpp_SOURCES = ${SRC}
    4545driver_cfa_cpp_LDADD = -ldl                     # yywrap
    46 driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O2 -g -std=c++14
     46driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I${abs_top_srcdir}/src/Parser -I${abs_top_srcdir}/src/include -DYY_NO_INPUT -O2 -g -std=c++14
    4747driver_cfa_cpp_LDFLAGS = -Xlinker -export-dynamic
    4848

  • src/Makefile.in

    r944a90f ra4248de1  
    365365AWK = @AWK@
    366366BACKEND_CC = @BACKEND_CC@
    367 BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    368 BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
    369367CC = @CC@
    370368CCAS = @CCAS@
    … …  
    372370CCASFLAGS = @CCASFLAGS@
    373371CCDEPMODE = @CCDEPMODE@
    374 CFACC = @CFACC@
    375 CFACPP = @CFACPP@
    376372CFA_BACKEND_CC = @CFA_BACKEND_CC@
    377373CFA_BINDIR = @CFA_BINDIR@
    … …  
    390386DEFS = @DEFS@
    391387DEPDIR = @DEPDIR@
    392 DRIVER_DIR = @DRIVER_DIR@
    393388ECHO_C = @ECHO_C@
    394389ECHO_N = @ECHO_N@
    … …  
    541536
    542537# put into lib for now
    543 cfa_cpplibdir = $(CFA_LIBDIR)
    544 driver_cfa_cpp_SOURCES = $(SRC)
     538cfa_cpplibdir = ${CFA_LIBDIR}
     539driver_cfa_cpp_SOURCES = ${SRC}
    545540driver_cfa_cpp_LDADD = -ldl                     # yywrap
    546 driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O2 -g -std=c++14
     541driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I${abs_top_srcdir}/src/Parser -I${abs_top_srcdir}/src/include -DYY_NO_INPUT -O2 -g -std=c++14
    547542driver_cfa_cpp_LDFLAGS = -Xlinker -export-dynamic
    548543all: $(BUILT_SOURCES)

  • src/benchmark/Makefile.am

    r944a90f ra4248de1  
    1818CFLAGS =
    1919AM_CFLAGS = \
     20        -XCFA \
     21        -t \
     22        -B${abs_top_builddir}/src/driver \
    2023        -g \
    2124        -O2 \
    … …  
    2427        -quiet \
    2528        -I$(srcdir) \
    26         @BUILD_IN_TREE_FLAGS@
    27 
    28 CC = @CFACC@
     29        -L${abs_top_builddir}/src/libcfa \
     30        -I${abs_top_srcdir}/src/libcfa \
     31        -I${abs_top_srcdir}/src/libcfa/containers \
     32        -I${abs_top_srcdir}/src/libcfa/concurrency \
     33        -I${abs_top_srcdir}/src/libcfa/stdhdr
     34
     35CC = ${top_builddir}/src/driver/cfa
    2936TOOLSDIR = ${abs_top_srcdir}/tools/
    3037REPEAT   = ${TOOLSDIR}repeat

  • src/benchmark/Makefile.in

    r944a90f ra4248de1  
    135135AWK = @AWK@
    136136BACKEND_CC = @BACKEND_CC@
    137 BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    138 BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
    139 CC = @CFACC@
     137CC = ${top_builddir}/src/driver/cfa
    140138CCAS = @CCAS@
    141139CCASDEPMODE = @CCASDEPMODE@
    142140CCASFLAGS = @CCASFLAGS@
    143141CCDEPMODE = @CCDEPMODE@
    144 CFACC = @CFACC@
    145 CFACPP = @CFACPP@
    146142CFA_BACKEND_CC = @CFA_BACKEND_CC@
    147143CFA_BINDIR = @CFA_BINDIR@
    … …  
    162158DEFS = @DEFS@
    163159DEPDIR = @DEPDIR@
    164 DRIVER_DIR = @DRIVER_DIR@
    165160ECHO_C = @ECHO_C@
    166161ECHO_N = @ECHO_N@
    … …  
    253248top_srcdir = @top_srcdir@
    254249AM_CFLAGS = \
     250        -XCFA \
     251        -t \
     252        -B${abs_top_builddir}/src/driver \
    255253        -g \
    256254        -O2 \
    … …  
    259257        -quiet \
    260258        -I$(srcdir) \
    261         @BUILD_IN_TREE_FLAGS@
     259        -L${abs_top_builddir}/src/libcfa \
     260        -I${abs_top_srcdir}/src/libcfa \
     261        -I${abs_top_srcdir}/src/libcfa/containers \
     262        -I${abs_top_srcdir}/src/libcfa/concurrency \
     263        -I${abs_top_srcdir}/src/libcfa/stdhdr
    262264
    263265TOOLSDIR = ${abs_top_srcdir}/tools/

  • src/driver/Makefile.in

    r944a90f ra4248de1  
    181181AWK = @AWK@
    182182BACKEND_CC = @BACKEND_CC@
    183 BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    184 BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
    185183CC = @CC@
    186184CCAS = @CCAS@
    … …  
    188186CCASFLAGS = @CCASFLAGS@
    189187CCDEPMODE = @CCDEPMODE@
    190 CFACC = @CFACC@
    191 CFACPP = @CFACPP@
    192188CFA_BACKEND_CC = @CFA_BACKEND_CC@
    193189CFA_BINDIR = @CFA_BINDIR@
    … …  
    206202DEFS = @DEFS@
    207203DEPDIR = @DEPDIR@
    208 DRIVER_DIR = @DRIVER_DIR@
    209204ECHO_C = @ECHO_C@
    210205ECHO_N = @ECHO_N@

  • src/examples/Makefile.am

    r944a90f ra4248de1  
    2525avl_test_SOURCES = avltree/avl_test.c avltree/avl0.c avltree/avl1.c avltree/avl2.c avltree/avl3.c avltree/avl4.c avltree/avl-private.c
    2626
    27 Bench$(EXEEXT) : Bench.c
     27Bench : Bench.c
    2828        @for ccflags in "-debug" "-nodebug"; do \
    2929                echo ${CC} ${AM_CFLAGS} ${CFLAGS} $${ccflags} -lrt Bench.c;\

  • src/examples/Makefile.in

    r944a90f ra4248de1  
    189189AWK = @AWK@
    190190BACKEND_CC = @BACKEND_CC@
    191 BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    192 BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
    193191CC = @CFA_BINDIR@/@CFA_NAME@
    194192CCAS = @CCAS@
    … …  
    196194CCASFLAGS = @CCASFLAGS@
    197195CCDEPMODE = @CCDEPMODE@
    198 CFACC = @CFACC@
    199 CFACPP = @CFACPP@
    200196CFA_BACKEND_CC = @CFA_BACKEND_CC@
    201197CFA_BINDIR = @CFA_BINDIR@
    … …  
    216212DEFS = @DEFS@
    217213DEPDIR = @DEPDIR@
    218 DRIVER_DIR = @DRIVER_DIR@
    219214ECHO_C = @ECHO_C@
    220215ECHO_N = @ECHO_N@
    … …  
    620615
    621616
    622 Bench$(EXEEXT) : Bench.c
     617Bench : Bench.c
    623618        @for ccflags in "-debug" "-nodebug"; do \
    624619                echo ${CC} ${AM_CFLAGS} ${CFLAGS} $${ccflags} -lrt Bench.c;\

  • src/libcfa/Makefile.am

    r944a90f ra4248de1  
    4343#use -no-include-stdhdr to prevent rebuild cycles
    4444#The built sources must not depend on the installed headers
    45 CFLAGS = -quiet -no-include-stdhdr @BUILD_IN_TREE_FLAGS@ ${EXTRA_FLAGS}
    46 CC = @CFACC@
     45CFLAGS = -quiet -no-include-stdhdr -I${abs_top_srcdir}/src/libcfa/stdhdr -XCFA -t -B${abs_top_builddir}/src/driver ${EXTRA_FLAGS}
     46CC = ${abs_top_builddir}/src/driver/cfa
    4747
    4848headers = fstream iostream iterator limits rational time stdlib common \
    … …  
    9292        ${AM_V_CC}@BACKEND_CC@ -DHAVE_CONFIG_H -I. -I../.. -D__CFA_DEBUG__ -O0 ${EXTRA_FLAGS} -c -o $@ $<
    9393
    94 ${libobjs} : @CFACPP@ ${cfalib_DATA} # add dependency to cfa-cpp so all libraries are rebuilt with new translator
     94${libobjs} : ${abs_top_srcdir}/src/driver/cfa-cpp ${cfalib_DATA} # add dependency to cfa-cpp so all libraries are rebuilt with new translator
    9595
    9696libcfa_a_SOURCES = ${libsrc}

  • src/libcfa/Makefile.in

    r944a90f ra4248de1  
    303303AWK = @AWK@
    304304BACKEND_CC = @BACKEND_CC@
    305 BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    306 BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
    307 CC = @CFACC@
     305CC = ${abs_top_builddir}/src/driver/cfa
    308306CCAS = @CCAS@
    309307CCASDEPMODE = @CCASDEPMODE@
    310308CCASFLAGS = @CCASFLAGS@
    311309CCDEPMODE = @CCDEPMODE@
    312 CFACC = @CFACC@
    313 CFACPP = @CFACPP@
    314310CFA_BACKEND_CC = @CFA_BACKEND_CC@
    315311CFA_BINDIR = @CFA_BINDIR@
    … …  
    323319#use -no-include-stdhdr to prevent rebuild cycles
    324320#The built sources must not depend on the installed headers
    325 CFLAGS = -quiet -no-include-stdhdr @BUILD_IN_TREE_FLAGS@ ${EXTRA_FLAGS}
     321CFLAGS = -quiet -no-include-stdhdr -I${abs_top_srcdir}/src/libcfa/stdhdr -XCFA -t -B${abs_top_builddir}/src/driver ${EXTRA_FLAGS}
    326322CPP = @CPP@
    327323CPPFLAGS = @CPPFLAGS@
    … …  
    332328DEFS = @DEFS@
    333329DEPDIR = @DEPDIR@
    334 DRIVER_DIR = @DRIVER_DIR@
    335330ECHO_C = @ECHO_C@
    336331ECHO_N = @ECHO_N@
    … …  
    17091704        ${AM_V_CC}@BACKEND_CC@ -DHAVE_CONFIG_H -I. -I../.. -D__CFA_DEBUG__ -O0 ${EXTRA_FLAGS} -c -o $@ $<
    17101705
    1711 ${libobjs} : @CFACPP@ ${cfalib_DATA} # add dependency to cfa-cpp so all libraries are rebuilt with new translator
     1706${libobjs} : ${abs_top_srcdir}/src/driver/cfa-cpp ${cfalib_DATA} # add dependency to cfa-cpp so all libraries are rebuilt with new translator
    17121707
    17131708maintainer-clean-local:

  • src/prelude/Makefile.am

    r944a90f ra4248de1  
    2323noinst_DATA = ../libcfa/libcfa-prelude.c
    2424
    25 CC = @CFACC@
     25CC = ${abs_top_builddir}/src/driver/cfa
    2626
    2727$(DEPDIR) :
    … …  
    5858include $(DEPDIR)/builtins.Po
    5959
    60 ../libcfa/libcfa-prelude.c : prelude.cf extras.cf gcc-builtins.cf builtins.cf @CFACPP@
    61         ${AM_V_GEN}@CFACPP@ -l prelude.cf $@  # use src/cfa-cpp as not in lib until after install
     60../libcfa/libcfa-prelude.c : prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_builddir}/src/driver/cfa-cpp
     61        ${AM_V_GEN}${abs_top_builddir}/src/driver/cfa-cpp -l prelude.cf $@  # use src/cfa-cpp as not in lib until after install
    6262
    63 bootloader.c : ${srcdir}/bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf @CFACPP@
    64         ${AM_V_GEN}@CFACPP@ -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
     63bootloader.c : ${srcdir}/bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_builddir}/src/driver/cfa-cpp
     64        ${AM_V_GEN}${abs_top_builddir}/src/driver/cfa-cpp -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
    6565
    6666maintainer-clean-local :

  • src/prelude/Makefile.in

    r944a90f ra4248de1  
    162162AWK = @AWK@
    163163BACKEND_CC = @BACKEND_CC@
    164 BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    165 BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
    166 CC = @CFACC@
     164CC = ${abs_top_builddir}/src/driver/cfa
    167165CCAS = @CCAS@
    168166CCASDEPMODE = @CCASDEPMODE@
    169167CCASFLAGS = @CCASFLAGS@
    170168CCDEPMODE = @CCDEPMODE@
    171 CFACC = @CFACC@
    172 CFACPP = @CFACPP@
    173169CFA_BACKEND_CC = @CFA_BACKEND_CC@
    174170CFA_BINDIR = @CFA_BINDIR@
    … …  
    187183DEFS = @DEFS@
    188184DEPDIR = @DEPDIR@
    189 DRIVER_DIR = @DRIVER_DIR@
    190185ECHO_C = @ECHO_C@
    191186ECHO_N = @ECHO_N@
    … …  
    531526include $(DEPDIR)/builtins.Po
    532527
    533 ../libcfa/libcfa-prelude.c : prelude.cf extras.cf gcc-builtins.cf builtins.cf @CFACPP@
    534         ${AM_V_GEN}@CFACPP@ -l prelude.cf $@  # use src/cfa-cpp as not in lib until after install
    535 
    536 bootloader.c : ${srcdir}/bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf @CFACPP@
    537         ${AM_V_GEN}@CFACPP@ -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
     528../libcfa/libcfa-prelude.c : prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_builddir}/src/driver/cfa-cpp
     529        ${AM_V_GEN}${abs_top_builddir}/src/driver/cfa-cpp -l prelude.cf $@  # use src/cfa-cpp as not in lib until after install
     530
     531bootloader.c : ${srcdir}/bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_builddir}/src/driver/cfa-cpp
     532        ${AM_V_GEN}${abs_top_builddir}/src/driver/cfa-cpp -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
    538533
    539534maintainer-clean-local :

  • src/tests/Makefile.am

    r944a90f ra4248de1  
    3030# applies to both programs
    3131AM_CFLAGS = $(if $(test), 2> $(test), ) \
     32        -XCFA \
     33        -t \
     34        -B${abs_top_builddir}/src/driver \
    3235        -g \
    3336        -Wall \
    3437        -Wno-unused-function \
    3538        -quiet @CFA_FLAGS@ \
     39        -I. \
    3640        -DIN_DIR="${srcdir}/.in/" \
    37         @BUILD_IN_TREE_FLAGS@
     41        -L${abs_top_builddir}/src/libcfa \
     42        -I${abs_top_srcdir}/src/libcfa \
     43        -I${abs_top_srcdir}/src/libcfa/containers \
     44        -I${abs_top_srcdir}/src/libcfa/concurrency \
     45        -I${abs_top_srcdir}/src/libcfa/stdhdr
    3846
    3947if !BUILD_DEBUG
    … …  
    4755endif
    4856
    49 CC = @CFACC@
     57CC = ${abs_top_builddir}/src/driver/cfa
    5058
    5159.PHONY : list
    … …  
    8593# implicit rule so not all test require a rule
    8694% : %.c $(CC)
     95        echo $(headers_deps)
    8796        $(COMPILE) $(abspath ${<}) -o ${@}
    8897

  • src/tests/Makefile.in

    r944a90f ra4248de1  
    181181AWK = @AWK@
    182182BACKEND_CC = @BACKEND_CC@
    183 BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    184 BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
    185 CC = @CFACC@
     183CC = ${abs_top_builddir}/src/driver/cfa
    186184CCAS = @CCAS@
    187185CCASDEPMODE = @CCASDEPMODE@
    188186CCASFLAGS = @CCASFLAGS@
    189187CCDEPMODE = @CCDEPMODE@
    190 CFACC = @CFACC@
    191 CFACPP = @CFACPP@
    192188CFA_BACKEND_CC = @CFA_BACKEND_CC@
    193189CFA_BINDIR = @CFA_BINDIR@
    … …  
    206202DEFS = @DEFS@
    207203DEPDIR = @DEPDIR@
    208 DRIVER_DIR = @DRIVER_DIR@
    209204ECHO_C = @ECHO_C@
    210205ECHO_N = @ECHO_N@
    … …  
    303298
    304299# applies to both programs
    305 AM_CFLAGS = $(if $(test), 2> $(test), ) -g -Wall -Wno-unused-function \
    306         -quiet @CFA_FLAGS@ -DIN_DIR="${srcdir}/.in/" \
    307         @BUILD_IN_TREE_FLAGS@ $(am__append_1) $(am__append_2) \
    308         $(am__append_3)
     300AM_CFLAGS = $(if $(test), 2> $(test), ) -XCFA -t \
     301        -B${abs_top_builddir}/src/driver -g -Wall -Wno-unused-function \
     302        -quiet @CFA_FLAGS@ -I. -DIN_DIR="${srcdir}/.in/" \
     303        -L${abs_top_builddir}/src/libcfa \
     304        -I${abs_top_srcdir}/src/libcfa \
     305        -I${abs_top_srcdir}/src/libcfa/containers \
     306        -I${abs_top_srcdir}/src/libcfa/concurrency \
     307        -I${abs_top_srcdir}/src/libcfa/stdhdr $(am__append_1) \
     308        $(am__append_2) $(am__append_3)
    309309fstream_test_SOURCES = fstream_test.c
    310310avl_test_SOURCES = avltree/avl_test.c avltree/avl0.c avltree/avl1.c avltree/avl2.c avltree/avl3.c avltree/avl4.c avltree/avl-private.c
    311311
    312312# SKULLDUGGERY like libcfa/Makefile.am prevent extensionless headers from being generated
    313 # however, here it is more complicated because it must match the dependencies based on how
    314 # they are generated by gcc
     313# however, here it is more complicated because it must match the dependencies exactly
     314# depencies seem to have the absolute path to the build directory and relative path
     315# to the headers from there
    315316headers = $(shell find $(top_srcdir)/src/libcfa -type f ! -name "*.*")
    316317headers_real = $(shell realpath --relative-to=$(top_srcdir)/src/libcfa $(headers))
    … …  
    641642# implicit rule so not all test require a rule
    642643% : %.c $(CC)
     644        echo $(headers_deps)
    643645        $(COMPILE) $(abspath ${<}) -o ${@}
    644646

  • src/tests/preempt_longrun/Makefile.am

    r944a90f ra4248de1  
    3232BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -O2 -DPREEMPTION_RATE=${preempt} -I.. -I. -DTEST_$(shell cat .type | tr a-z A-Z)
    3333CFLAGS = ${BUILD_FLAGS}
    34 CC = @CFACC@
     34CC = ${top_builddir}/src/driver/cfa
    3535
    3636TESTS = block coroutine create disjoint enter enter3 processor stack wait yield

  • src/tests/preempt_longrun/Makefile.in

    r944a90f ra4248de1  
    337337AWK = @AWK@
    338338BACKEND_CC = @BACKEND_CC@
    339 BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    340 BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
    341 CC = @CFACC@
     339CC = ${top_builddir}/src/driver/cfa
    342340CCAS = @CCAS@
    343341CCASDEPMODE = @CCASDEPMODE@
    344342CCASFLAGS = @CCASFLAGS@
    345343CCDEPMODE = @CCDEPMODE@
    346 CFACC = @CFACC@
    347 CFACPP = @CFACPP@
    348344CFA_BACKEND_CC = @CFA_BACKEND_CC@
    349345CFA_BINDIR = @CFA_BINDIR@
    … …  
    362358DEFS = @DEFS@
    363359DEPDIR = @DEPDIR@
    364 DRIVER_DIR = @DRIVER_DIR@
    365360ECHO_C = @ECHO_C@
    366361ECHO_N = @ECHO_N@

  • tools/Makefile.in

    r944a90f ra4248de1  
    186186AWK = @AWK@
    187187BACKEND_CC = @BACKEND_CC@
    188 BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    189 BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
    190188CC = @BACKEND_CC@
    191189CCAS = @CCAS@
    … …  
    193191CCASFLAGS = @CCASFLAGS@
    194192CCDEPMODE = @CCDEPMODE@
    195 CFACC = @CFACC@
    196 CFACPP = @CFACPP@
    197193CFA_BACKEND_CC = @CFA_BACKEND_CC@
    198194CFA_BINDIR = @CFA_BINDIR@
    … …  
    211207DEFS = @DEFS@
    212208DEPDIR = @DEPDIR@
    213 DRIVER_DIR = @DRIVER_DIR@
    214209ECHO_C = @ECHO_C@
    215210ECHO_N = @ECHO_N@

  • tools/prettyprinter/Makefile.in

    r944a90f ra4248de1  
    210210AWK = @AWK@
    211211BACKEND_CC = @BACKEND_CC@
    212 BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    213 BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
    214212CC = @CC@
    215213CCAS = @CCAS@
    … …  
    217215CCASFLAGS = @CCASFLAGS@
    218216CCDEPMODE = @CCDEPMODE@
    219 CFACC = @CFACC@
    220 CFACPP = @CFACPP@
    221217CFA_BACKEND_CC = @CFA_BACKEND_CC@
    222218CFA_BINDIR = @CFA_BINDIR@
    … …  
    235231DEFS = @DEFS@
    236232DEPDIR = @DEPDIR@
    237 DRIVER_DIR = @DRIVER_DIR@
    238233ECHO_C = @ECHO_C@
    239234ECHO_N = @ECHO_N@
Note: See TracChangeset for help on using the changeset viewer.