Ignore:
Timestamp:
Jul 24, 2018, 1:35:01 PM (6 years ago)
Author:
Thierry Delisle <tdelisle@…>
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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum
Children:
857638d, e89f4b1
Parents:
2514607d
Message:

Fixed some inconsistencies in the srcdir/builddir for tests and libcfa

File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/tests/Makefile.am

    r2514607d re68b3a8  
    4444TEST_FLAGS = $(if $(test), 2> $(test), )
    4545AM_CFLAGS = ${TEST_FLAGS} ${BUILD_FLAGS}
    46 CC = ${abs_top_builddir}/src/driver/cfa -I${srcdir} -DIN_DIR="${srcdir}/.in/"
     46CC = ${abs_top_builddir}/src/driver/cfa -DIN_DIR="${srcdir}/.in/"
    4747
    4848.PHONY : list
    4949EXTRA_PROGRAMS = fstream_test avl_test # build but do not install
    5050
    51 fstream_test_SOURCES = ${srcdir}/fstream_test.c
     51fstream_test_SOURCES = fstream_test.c
    5252fstream_test_CFLAGS = $(if $(test), 2>> $(test), ) ${BUILD_FLAGS}
    5353
    54 avl_test_SOURCES = ${srcdir}/avltree/avl_test.c ${srcdir}/avltree/avl0.c ${srcdir}/avltree/avl1.c ${srcdir}/avltree/avl2.c ${srcdir}/avltree/avl3.c ${srcdir}/avltree/avl4.c ${srcdir}/avltree/avl-private.c
     54avl_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
    5555avl_test_CFLAGS = $(if $(test), 2>> $(test), ) ${BUILD_FLAGS}
    5656
    … …  
    7171
    7272% : ${srcdir}/%.c @CFA_BINDIR@/@CFA_NAME@
    73         ${CC} ${AM_CFLAGS} ${CFLAGS} $(abspath ${<}) -o ${@}
     73        $(COMPILE) $(abspath ${<}) -o ${@}
    7474
    7575declarationSpecifier: declarationSpecifier.c @CFA_BINDIR@/@CFA_NAME@
    76         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p $(abspath ${<}) -o ${@}
     76        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
    7777
    7878gccExtensions : gccExtensions.c @CFA_BINDIR@/@CFA_NAME@
    79         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p $(abspath ${<}) -o ${@}
     79        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
    8080
    8181extension : extension.c @CFA_BINDIR@/@CFA_NAME@
    82         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p $(abspath ${<}) -o ${@}
     82        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
    8383
    8484attributes : attributes.c @CFA_BINDIR@/@CFA_NAME@
    85         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p $(abspath ${<}) -o ${@}
     85        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
    8686
    8787functions: functions.c @CFA_BINDIR@/@CFA_NAME@
    88         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p $(abspath ${<}) -o ${@}
     88        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
    8989
    9090KRfunctions : KRfunctions.c @CFA_BINDIR@/@CFA_NAME@
    91         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p $(abspath ${<}) -o ${@}
     91        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
    9292
    9393sched-ext-parse : sched-ext-parse.c @CFA_BINDIR@/@CFA_NAME@
    94         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p $(abspath ${<}) -o ${@}
     94        $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
    9595
    9696gmp : gmp.c @CFA_BINDIR@/@CFA_NAME@
    97         ${CC} ${AM_CFLAGS} ${CFLAGS} -lgmp $(abspath ${<}) -o ${@}
     97        $(COMPILE) -lgmp $(abspath ${<}) -o ${@}
    9898
    9999completeTypeError : completeTypeError.c @CFA_BINDIR@/@CFA_NAME@
    100         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 $(abspath ${<}) -o ${@}
     100        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
    101101
    102102typedefRedef-ERR1: typedefRedef.c @CFA_BINDIR@/@CFA_NAME@
    103         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 $(abspath ${<}) -o ${@}
     103        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
    104104
    105105alloc-ERROR: alloc.c @CFA_BINDIR@/@CFA_NAME@
    106         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 $(abspath ${<}) -o ${@}
     106        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
    107107
    108108fallthrough-ERROR: fallthrough.c @CFA_BINDIR@/@CFA_NAME@
    109         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 $(abspath ${<}) -o ${@}
     109        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
    110110
    111111nested-types-ERR1: nested-types.c @CFA_BINDIR@/@CFA_NAME@
    112         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 $(abspath ${<}) -o ${@}
     112        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
    113113
    114114nested-types-ERR2: nested-types.c @CFA_BINDIR@/@CFA_NAME@
    115         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR2 $(abspath ${<}) -o ${@}
     115        $(COMPILE) -DERR2 $(abspath ${<}) -o ${@}
    116116
    117117# Constructor/destructor tests
    118118raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
    119         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 $(abspath ${<}) -o ${@}
     119        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
    120120
    121121raii/dtor-early-exit-ERR2: raii/dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
    122         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR2 $(abspath ${<}) -o ${@}
     122        $(COMPILE) -DERR2 $(abspath ${<}) -o ${@}
    123123
    124124raii/memberCtors-ERR1: raii/memberCtors.c @CFA_BINDIR@/@CFA_NAME@
    125         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 $(abspath ${<}) -o ${@}
     125        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
    126126
    127127raii/ctor-autogen-ERR1: raii/ctor-autogen.c @CFA_BINDIR@/@CFA_NAME@
    128         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 $(abspath ${<}) -o ${@}
     128        $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
    129129
    130130# Warnings
    131131warnings/self-assignment: warnings/self-assignment.c @CFA_BINDIR@/@CFA_NAME@
    132         ${CC} ${AM_CFLAGS} ${CFLAGS} $(abspath ${<}) 2> ${@} -fsyntax-only
     132        $(COMPILE) $(abspath ${<}) 2> ${@} -fsyntax-only
    133133
    134134#builtins
    135135builtins/sync: builtins/sync.c @CFA_BINDIR@/@CFA_NAME@
    136         ${CC} ${AM_CFLAGS} ${CFLAGS} $(abspath ${<}) 2> ${@} -fsyntax-only
     136        $(COMPILE) $(abspath ${<}) 2> ${@} -fsyntax-only
Note: See TracChangeset for help on using the changeset viewer.