Changeset 50697b0


Ignore:
Timestamp:
Jul 27, 2018, 3:33:11 PM (3 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer
Children:
bf5a6477
Parents:
f37279b
Message:

Create variable for cfa, cfa-cpp in driver directory

Files:
18 edited

Legend:

Unmodified
Added
Removed
  • Makefile.in

    rf37279b r50697b0  
    255255CCASFLAGS = @CCASFLAGS@
    256256CCDEPMODE = @CCDEPMODE@
     257CFACC = @CFACC@
     258CFACPP = @CFACPP@
    257259CFA_BACKEND_CC = @CFA_BACKEND_CC@
    258260CFA_BINDIR = @CFA_BINDIR@
     
    271273DEFS = @DEFS@
    272274DEPDIR = @DEPDIR@
     275DRIVER_DIR = @DRIVER_DIR@
    273276ECHO_C = @ECHO_C@
    274277ECHO_N = @ECHO_N@
  • configure

    rf37279b r50697b0  
    674674build_cpu
    675675build
     676CFACPP
     677CFACC
     678DRIVER_DIR
    676679CFA_LIBDIR
    677680CFA_BINDIR
     
    33753378
    33763379
     3380# Create variables for commonly used targets
     3381DRIVER_DIR='$(top_builddir)/src/driver'
     3382
     3383CFACC=${DRIVER_DIR}/cfa
     3384
     3385CFACPP=${DRIVER_DIR}/cfa-cpp
     3386
     3387
    33773388# Make sure we can run config.sub.
    33783389$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
  • configure.ac

    rf37279b r50697b0  
    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
     174DRIVER_DIR='$(top_builddir)/src/driver'
     175AC_SUBST(DRIVER_DIR)
     176CFACC=${DRIVER_DIR}/cfa
     177AC_SUBST(CFACC)
     178CFACPP=${DRIVER_DIR}/cfa-cpp
     179AC_SUBST(CFACPP)
    172180
    173181AC_CANONICAL_BUILD
  • src/Makefile.am

    rf37279b r50697b0  
    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${abs_top_srcdir}/src/Parser -I${abs_top_srcdir}/src/include -DYY_NO_INPUT -O2 -g -std=c++14
     46driver_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
    4747driver_cfa_cpp_LDFLAGS = -Xlinker -export-dynamic
    4848
  • src/Makefile.in

    rf37279b r50697b0  
    370370CCASFLAGS = @CCASFLAGS@
    371371CCDEPMODE = @CCDEPMODE@
     372CFACC = @CFACC@
     373CFACPP = @CFACPP@
    372374CFA_BACKEND_CC = @CFA_BACKEND_CC@
    373375CFA_BINDIR = @CFA_BINDIR@
     
    386388DEFS = @DEFS@
    387389DEPDIR = @DEPDIR@
     390DRIVER_DIR = @DRIVER_DIR@
    388391ECHO_C = @ECHO_C@
    389392ECHO_N = @ECHO_N@
     
    536539
    537540# put into lib for now
    538 cfa_cpplibdir = ${CFA_LIBDIR}
    539 driver_cfa_cpp_SOURCES = ${SRC}
     541cfa_cpplibdir = $(CFA_LIBDIR)
     542driver_cfa_cpp_SOURCES = $(SRC)
    540543driver_cfa_cpp_LDADD = -ldl                     # yywrap
    541 driver_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
     544driver_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
    542545driver_cfa_cpp_LDFLAGS = -Xlinker -export-dynamic
    543546all: $(BUILT_SOURCES)
  • src/benchmark/Makefile.in

    rf37279b r50697b0  
    140140CCASFLAGS = @CCASFLAGS@
    141141CCDEPMODE = @CCDEPMODE@
     142CFACC = @CFACC@
     143CFACPP = @CFACPP@
    142144CFA_BACKEND_CC = @CFA_BACKEND_CC@
    143145CFA_BINDIR = @CFA_BINDIR@
     
    158160DEFS = @DEFS@
    159161DEPDIR = @DEPDIR@
     162DRIVER_DIR = @DRIVER_DIR@
    160163ECHO_C = @ECHO_C@
    161164ECHO_N = @ECHO_N@
  • src/driver/Makefile.in

    rf37279b r50697b0  
    186186CCASFLAGS = @CCASFLAGS@
    187187CCDEPMODE = @CCDEPMODE@
     188CFACC = @CFACC@
     189CFACPP = @CFACPP@
    188190CFA_BACKEND_CC = @CFA_BACKEND_CC@
    189191CFA_BINDIR = @CFA_BINDIR@
     
    202204DEFS = @DEFS@
    203205DEPDIR = @DEPDIR@
     206DRIVER_DIR = @DRIVER_DIR@
    204207ECHO_C = @ECHO_C@
    205208ECHO_N = @ECHO_N@
  • src/examples/Makefile.am

    rf37279b r50697b0  
    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 : Bench.c
     27Bench$(EXEEXT) : Bench.c
    2828        @for ccflags in "-debug" "-nodebug"; do \
    2929                echo ${CC} ${AM_CFLAGS} ${CFLAGS} $${ccflags} -lrt Bench.c;\
  • src/examples/Makefile.in

    rf37279b r50697b0  
    194194CCASFLAGS = @CCASFLAGS@
    195195CCDEPMODE = @CCDEPMODE@
     196CFACC = @CFACC@
     197CFACPP = @CFACPP@
    196198CFA_BACKEND_CC = @CFA_BACKEND_CC@
    197199CFA_BINDIR = @CFA_BINDIR@
     
    212214DEFS = @DEFS@
    213215DEPDIR = @DEPDIR@
     216DRIVER_DIR = @DRIVER_DIR@
    214217ECHO_C = @ECHO_C@
    215218ECHO_N = @ECHO_N@
     
    615618
    616619
    617 Bench : Bench.c
     620Bench$(EXEEXT) : Bench.c
    618621        @for ccflags in "-debug" "-nodebug"; do \
    619622                echo ${CC} ${AM_CFLAGS} ${CFLAGS} $${ccflags} -lrt Bench.c;\
  • src/libcfa/Makefile.am

    rf37279b r50697b0  
    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 -I${abs_top_srcdir}/src/libcfa/stdhdr -XCFA -t -B${abs_top_builddir}/src/driver ${EXTRA_FLAGS}
    46 CC = ${abs_top_builddir}/src/driver/cfa
     45CFLAGS = -quiet -no-include-stdhdr -I${abs_top_srcdir}/src/libcfa/stdhdr -XCFA -t -B@DRIVER_DIR@ ${EXTRA_FLAGS}
     46CC = @CFACC@
    4747
    4848headers = fstream iostream iterator limits rational time stdlib common \
     
    8585        ${AM_V_CC}@BACKEND_CC@ -DHAVE_CONFIG_H -I. -I../.. -D__CFA_DEBUG__ -O0 ${EXTRA_FLAGS} -c -o $@ $<
    8686
    87 ${libobjs} : ${abs_top_srcdir}/src/driver/cfa-cpp ${cfalib_DATA} # add dependency to cfa-cpp so all libraries are rebuilt with new translator
     87${libobjs} : @CFACPP@ ${cfalib_DATA} # add dependency to cfa-cpp so all libraries are rebuilt with new translator
    8888
    8989libcfa_a_SOURCES = ${libsrc}
  • src/libcfa/Makefile.in

    rf37279b r50697b0  
    303303AWK = @AWK@
    304304BACKEND_CC = @BACKEND_CC@
    305 CC = ${abs_top_builddir}/src/driver/cfa
     305CC = @CFACC@
    306306CCAS = @CCAS@
    307307CCASDEPMODE = @CCASDEPMODE@
    308308CCASFLAGS = @CCASFLAGS@
    309309CCDEPMODE = @CCDEPMODE@
     310CFACC = @CFACC@
     311CFACPP = @CFACPP@
    310312CFA_BACKEND_CC = @CFA_BACKEND_CC@
    311313CFA_BINDIR = @CFA_BINDIR@
     
    319321#use -no-include-stdhdr to prevent rebuild cycles
    320322#The built sources must not depend on the installed headers
    321 CFLAGS = -quiet -no-include-stdhdr -I${abs_top_srcdir}/src/libcfa/stdhdr -XCFA -t -B${abs_top_builddir}/src/driver ${EXTRA_FLAGS}
     323CFLAGS = -quiet -no-include-stdhdr -I${abs_top_srcdir}/src/libcfa/stdhdr -XCFA -t -B@DRIVER_DIR@ ${EXTRA_FLAGS}
    322324CPP = @CPP@
    323325CPPFLAGS = @CPPFLAGS@
     
    328330DEFS = @DEFS@
    329331DEPDIR = @DEPDIR@
     332DRIVER_DIR = @DRIVER_DIR@
    330333ECHO_C = @ECHO_C@
    331334ECHO_N = @ECHO_N@
     
    16981701        ${AM_V_CC}@BACKEND_CC@ -DHAVE_CONFIG_H -I. -I../.. -D__CFA_DEBUG__ -O0 ${EXTRA_FLAGS} -c -o $@ $<
    16991702
    1700 ${libobjs} : ${abs_top_srcdir}/src/driver/cfa-cpp ${cfalib_DATA} # add dependency to cfa-cpp so all libraries are rebuilt with new translator
     1703${libobjs} : @CFACPP@ ${cfalib_DATA} # add dependency to cfa-cpp so all libraries are rebuilt with new translator
    17011704
    17021705maintainer-clean-local:
  • src/prelude/Makefile.am

    rf37279b r50697b0  
    2323noinst_DATA = ../libcfa/libcfa-prelude.c
    2424
    25 CC = ${abs_top_builddir}/src/driver/cfa
     25CC = @CFACC@
    2626
    2727$(DEPDIR) :
     
    5858include $(DEPDIR)/builtins.Po
    5959
    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
     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
    6262
    63 bootloader.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
     63bootloader.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
    6565
    6666maintainer-clean-local :
  • src/prelude/Makefile.in

    rf37279b r50697b0  
    162162AWK = @AWK@
    163163BACKEND_CC = @BACKEND_CC@
    164 CC = ${abs_top_builddir}/src/driver/cfa
     164CC = @CFACC@
    165165CCAS = @CCAS@
    166166CCASDEPMODE = @CCASDEPMODE@
    167167CCASFLAGS = @CCASFLAGS@
    168168CCDEPMODE = @CCDEPMODE@
     169CFACC = @CFACC@
     170CFACPP = @CFACPP@
    169171CFA_BACKEND_CC = @CFA_BACKEND_CC@
    170172CFA_BINDIR = @CFA_BINDIR@
     
    183185DEFS = @DEFS@
    184186DEPDIR = @DEPDIR@
     187DRIVER_DIR = @DRIVER_DIR@
    185188ECHO_C = @ECHO_C@
    186189ECHO_N = @ECHO_N@
     
    526529include $(DEPDIR)/builtins.Po
    527530
    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 
    531 bootloader.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
     531../libcfa/libcfa-prelude.c : prelude.cf extras.cf gcc-builtins.cf builtins.cf @CFACPP@
     532        ${AM_V_GEN}@CFACPP@ -l prelude.cf $@  # use src/cfa-cpp as not in lib until after install
     533
     534bootloader.c : ${srcdir}/bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf @CFACPP@
     535        ${AM_V_GEN}@CFACPP@ -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
    533536
    534537maintainer-clean-local :
  • src/tests/Makefile.am

    rf37279b r50697b0  
    3232        -XCFA \
    3333        -t \
    34         -B${abs_top_builddir}/src/driver \
     34        -B@DRIVER_DIR@ \
    3535        -g \
    3636        -Wall \
     
    5555endif
    5656
    57 CC = ${abs_top_builddir}/src/driver/cfa
     57CC = @CFACC@
    5858
    5959.PHONY : list
  • src/tests/Makefile.in

    rf37279b r50697b0  
    181181AWK = @AWK@
    182182BACKEND_CC = @BACKEND_CC@
    183 CC = ${abs_top_builddir}/src/driver/cfa
     183CC = @CFACC@
    184184CCAS = @CCAS@
    185185CCASDEPMODE = @CCASDEPMODE@
    186186CCASFLAGS = @CCASFLAGS@
    187187CCDEPMODE = @CCDEPMODE@
     188CFACC = @CFACC@
     189CFACPP = @CFACPP@
    188190CFA_BACKEND_CC = @CFA_BACKEND_CC@
    189191CFA_BINDIR = @CFA_BINDIR@
     
    202204DEFS = @DEFS@
    203205DEPDIR = @DEPDIR@
     206DRIVER_DIR = @DRIVER_DIR@
    204207ECHO_C = @ECHO_C@
    205208ECHO_N = @ECHO_N@
     
    298301
    299302# applies to both programs
    300 AM_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 \
     303AM_CFLAGS = $(if $(test), 2> $(test), ) -XCFA -t -B@DRIVER_DIR@ -g \
     304        -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -I. \
     305        -DIN_DIR="${srcdir}/.in/" -L${abs_top_builddir}/src/libcfa \
    304306        -I${abs_top_srcdir}/src/libcfa \
    305307        -I${abs_top_srcdir}/src/libcfa/containers \
  • src/tests/preempt_longrun/Makefile.in

    rf37279b r50697b0  
    342342CCASFLAGS = @CCASFLAGS@
    343343CCDEPMODE = @CCDEPMODE@
     344CFACC = @CFACC@
     345CFACPP = @CFACPP@
    344346CFA_BACKEND_CC = @CFA_BACKEND_CC@
    345347CFA_BINDIR = @CFA_BINDIR@
     
    358360DEFS = @DEFS@
    359361DEPDIR = @DEPDIR@
     362DRIVER_DIR = @DRIVER_DIR@
    360363ECHO_C = @ECHO_C@
    361364ECHO_N = @ECHO_N@
  • tools/Makefile.in

    rf37279b r50697b0  
    191191CCASFLAGS = @CCASFLAGS@
    192192CCDEPMODE = @CCDEPMODE@
     193CFACC = @CFACC@
     194CFACPP = @CFACPP@
    193195CFA_BACKEND_CC = @CFA_BACKEND_CC@
    194196CFA_BINDIR = @CFA_BINDIR@
     
    207209DEFS = @DEFS@
    208210DEPDIR = @DEPDIR@
     211DRIVER_DIR = @DRIVER_DIR@
    209212ECHO_C = @ECHO_C@
    210213ECHO_N = @ECHO_N@
  • tools/prettyprinter/Makefile.in

    rf37279b r50697b0  
    215215CCASFLAGS = @CCASFLAGS@
    216216CCDEPMODE = @CCDEPMODE@
     217CFACC = @CFACC@
     218CFACPP = @CFACPP@
    217219CFA_BACKEND_CC = @CFA_BACKEND_CC@
    218220CFA_BINDIR = @CFA_BINDIR@
     
    231233DEFS = @DEFS@
    232234DEPDIR = @DEPDIR@
     235DRIVER_DIR = @DRIVER_DIR@
    233236ECHO_C = @ECHO_C@
    234237ECHO_N = @ECHO_N@
Note: See TracChangeset for help on using the changeset viewer.