Changes in / [2988eeb:c443d1d]


Ignore:
Files:
21 edited

Legend:

Unmodified
Added
Removed

  • Makefile.in

    r2988eeb rc443d1d  
    135135CFA_INCDIR = @CFA_INCDIR@
    136136CFA_LIBDIR = @CFA_LIBDIR@
    137 CFA_NAME = @CFA_NAME@
    138137CFA_PREFIX = @CFA_PREFIX@
    139138CFLAGS = @CFLAGS@

  • configure

    r2988eeb rc443d1d  
    668668CFA_BACKEND_CC
    669669BACKEND_CC
    670 CFA_NAME
    671670MAINT
    672671MAINTAINER_MODE_FALSE
    … …  
    30023001                        # may require auto* software to be installed
    30033002
    3004 # Allow program name tansformation
    3005 # will fille program_transform_name with appropriate sed regex
    3006 
    3007 #autoconf escapes $ and \ since automake wiill un-escape them.
    3008 #Since we need to use the sed transform in autoconf we need to manualy un-escape these characters
    3009 name_transform=`echo ${program_transform_name} | sed 's/\\$\\$/\\$/g' | sed 's/\\\\\\\/\\\/g'`
    3010 cfa_name=`echo cfa | sed ${name_transform}`
    3011 cc1_name=`echo cc1 | sed ${name_transform}`
    3012 cpp_name=`echo cfa-cpp | sed ${name_transform}`
    3013 
    3014 #Trasforming cc1 will break compilation
    3015 if ! test "${cc1_name}" = "cc1"; then
    3016     as_fn_error $? "Program transform must not modify cc1.
    3017                 --program-sufix and --program-prefix not supported.
    3018                 Use -program-transform-name='s/cfa$/[Desired name here]/' instead" "$LINENO" 5
    3019 fi
    3020 #We could support transforming cfa-cpp but since it is located in a unique subfolder we don't need to
    3021 if ! test "${cpp_name}" = "cfa-cpp"; then
    3022     as_fn_error $? "Program transform must not modify cfa-cpp.
    3023                 --program-sufix and --program-prefix not supported.
    3024                 Use -program-transform-name='s/cfa$/[Desired name here]/' instead" "$LINENO" 5
    3025 fi
    3026 
    3027 #Define the new name of the installed command
    3028 CFA_NAME=${cfa_name}
    3029 
    3030 
    30313003rm -f version
    30323004echo ${PACKAGE_VERSION} > version               # file containing version number for other tools
    … …  
    32663238
    32673239if test "$includedir" = '${prefix}/include'; then
    3268         cfa_incdir="${cfa_prefix}/include/${cfa_name}"
     3240        cfa_incdir="${cfa_prefix}/include/cfa"
    32693241else
    32703242        cfa_incdir=${includedir}
    … …  
    32923264
    32933265if test "$libdir" = '${exec_prefix}/lib'; then
    3294         cfa_libdir="${cfa_prefix}/lib/${cfa_name}"
     3266        cfa_libdir=${cfa_prefix}/lib
    32953267else
    32963268        cfa_libdir=${libdir}

  • configure.ac

    r2988eeb rc443d1d  
    1717AM_INIT_AUTOMAKE
    1818AM_MAINTAINER_MODE(enable)                      # may require auto* software to be installed
    19 
    20 # Allow program name tansformation
    21 # will fille program_transform_name with appropriate sed regex
    22 AC_ARG_PROGRAM
    23 #autoconf escapes $ and \ since automake wiill un-escape them.
    24 #Since we need to use the sed transform in autoconf we need to manualy un-escape these characters
    25 name_transform=`echo ${program_transform_name} | sed 's/\\$\\$/\\$/g' | sed 's/\\\\\\\/\\\/g'`
    26 cfa_name=`echo cfa | sed ${name_transform}`
    27 cc1_name=`echo cc1 | sed ${name_transform}`
    28 cpp_name=`echo cfa-cpp | sed ${name_transform}`
    29 
    30 #Trasforming cc1 will break compilation
    31 if ! test "${cc1_name}" = "cc1"; then
    32     AC_MSG_ERROR([Program transform must not modify cc1.
    33                 --program-sufix and --program-prefix not supported.
    34                 Use -program-transform-name='s/cfa$/[[Desired name here]]/' instead])
    35 fi
    36 #We could support transforming cfa-cpp but since it is located in a unique subfolder we don't need to
    37 if ! test "${cpp_name}" = "cfa-cpp"; then
    38     AC_MSG_ERROR([Program transform must not modify cfa-cpp.
    39                 --program-sufix and --program-prefix not supported.
    40                 Use -program-transform-name='s/cfa$/[[Desired name here]]/' instead])
    41 fi
    42 
    43 #Define the new name of the installed command
    44 AC_SUBST(CFA_NAME, ${cfa_name})
    4519
    4620rm -f version
    … …  
    155129
    156130if test "$includedir" = '${prefix}/include'; then
    157         cfa_incdir="${cfa_prefix}/include/${cfa_name}"
     131        cfa_incdir="${cfa_prefix}/include/cfa"
    158132else
    159133        cfa_incdir=${includedir}
    … …  
    171145
    172146if test "$libdir" = '${exec_prefix}/lib'; then
    173         cfa_libdir="${cfa_prefix}/lib/${cfa_name}"
     147        cfa_libdir=${cfa_prefix}/lib
    174148else
    175149        cfa_libdir=${libdir}

  • src/Makefile.am

    r2988eeb rc443d1d  
    3838
    3939# put into lib for now
    40 cfa_cpplibdir = ${CFA_LIBDIR}
     40cfa_cpplibdir = ${libdir}
    4141cfa_cpplib_PROGRAMS = driver/cfa-cpp
    4242driver_cfa_cpp_SOURCES = ${SRC}

  • src/Makefile.in

    r2988eeb rc443d1d  
    276276CFA_INCDIR = @CFA_INCDIR@
    277277CFA_LIBDIR = @CFA_LIBDIR@
    278 CFA_NAME = @CFA_NAME@
    279278CFA_PREFIX = @CFA_PREFIX@
    280279CFLAGS = @CFLAGS@
    … …  
    437436
    438437# put into lib for now
    439 cfa_cpplibdir = ${CFA_LIBDIR}
     438cfa_cpplibdir = ${libdir}
    440439driver_cfa_cpp_SOURCES = ${SRC}
    441440driver_cfa_cpp_LDADD = ${LEXLIB} -ldl                   # yywrap

  • src/benchmark/Makefile.am

    r2988eeb rc443d1d  
    1818CFLAGS =
    1919AM_CFLAGS = -g -Wall -Wno-unused-function -O2
    20 CC = @CFA_BINDIR@/@CFA_NAME@
     20CC = @CFA_BINDIR@/cfa
    2121
    2222noinst_PROGRAMS = bench ctxswitch-coroutine ctxswitch-thread

  • src/benchmark/Makefile.in

    r2988eeb rc443d1d  
    9494AWK = @AWK@
    9595BACKEND_CC = @BACKEND_CC@
    96 CC = @CFA_BINDIR@/@CFA_NAME@
     96CC = @CFA_BINDIR@/cfa
    9797CCAS = @CCAS@
    9898CCASDEPMODE = @CCASDEPMODE@
    … …  
    104104CFA_INCDIR = @CFA_INCDIR@
    105105CFA_LIBDIR = @CFA_LIBDIR@
    106 CFA_NAME = @CFA_NAME@
    107106CFA_PREFIX = @CFA_PREFIX@
    108107

  • src/driver/Makefile.am

    r2988eeb rc443d1d  
    3232
    3333# put into lib for now
    34 cc1libdir = ${CFA_LIBDIR}
     34cc1libdir = ${libdir}
    3535cc1lib_PROGRAMS = cc1
    3636cc1_SOURCES = cc1.cc

  • src/driver/Makefile.in

    r2988eeb rc443d1d  
    106106CFA_INCDIR = @CFA_INCDIR@
    107107CFA_LIBDIR = @CFA_LIBDIR@
    108 CFA_NAME = @CFA_NAME@
    109108CFA_PREFIX = @CFA_PREFIX@
    110109CFLAGS = @CFLAGS@
    … …  
    213212
    214213# put into lib for now
    215 cc1libdir = ${CFA_LIBDIR}
     214cc1libdir = ${libdir}
    216215cc1_SOURCES = cc1.cc
    217216MAINTAINERCLEANFILES = @CFA_PREFIX@/bin/${bin_PROGRAMS} @CFA_PREFIX@/lib/${cc1lib_PROGRAMS}

  • src/examples/Makefile.am

    r2988eeb rc443d1d  
    1818CFLAGS =
    1919AM_CFLAGS = -g -Wall -Wno-unused-function -O2
    20 CC = @CFA_BINDIR@/@CFA_NAME@
     20CC = @CFA_BINDIR@/cfa
    2121
    2222noinst_PROGRAMS = fstream_test vector_test avl_test Bench # build but do not install

  • src/examples/Makefile.in

    r2988eeb rc443d1d  
    105105AWK = @AWK@
    106106BACKEND_CC = @BACKEND_CC@
    107 CC = @CFA_BINDIR@/@CFA_NAME@
     107CC = @CFA_BINDIR@/cfa
    108108CCAS = @CCAS@
    109109CCASDEPMODE = @CCASDEPMODE@
    … …  
    115115CFA_INCDIR = @CFA_INCDIR@
    116116CFA_LIBDIR = @CFA_LIBDIR@
    117 CFA_NAME = @CFA_NAME@
    118117CFA_PREFIX = @CFA_PREFIX@
    119118

  • src/libcfa/Makefile.am

    r2988eeb rc443d1d  
    1818AUTOMAKE_OPTIONS = subdir-objects
    1919
    20 libdir = ${CFA_LIBDIR}
    2120lib_LIBRARIES =
    2221
    … …  
    6867${libobjs} : ${abs_top_srcdir}/src/driver/cfa-cpp ${cfalib_DATA} # add dependency to cfa-cpp so all libraries are rebuilt with new translator
    6968
     69
    7070libcfa_a_SOURCES = ${libsrc}
    7171libcfa_a_CFLAGS = -nodebug -O2
    … …  
    7575stdhdr = ${shell echo stdhdr/*}
    7676
    77 cfa_includedir = $(CFA_INCDIR)
     77cfa_includedir = $(includedir)/cfa
    7878nobase_cfa_include_HEADERS = ${headers} ${stdhdr} concurrency/invoke.h
    7979
    … …  
    8181
    8282maintainer-clean-local:
    83         -rm -rf ${includedir}/* ${libdir}/*
     83        -rm -rf ${includedir}/*

  • src/libcfa/Makefile.in

    r2988eeb rc443d1d  
    201201CFA_INCDIR = @CFA_INCDIR@
    202202CFA_LIBDIR = @CFA_LIBDIR@
    203 CFA_NAME = @CFA_NAME@
    204203CFA_PREFIX = @CFA_PREFIX@
    205204CFLAGS = -quiet -no-include-stdhdr -XCFA -t -B${abs_top_srcdir}/src/driver ${EXTRA_FLAGS}
    … …  
    282281infodir = @infodir@
    283282install_sh = @install_sh@
    284 libdir = ${CFA_LIBDIR}
     283libdir = @libdir@
    285284libexecdir = @libexecdir@
    286285localedir = @localedir@
    … …  
    316315libcfa_d_a_CFLAGS = -debug -O0
    317316stdhdr = ${shell echo stdhdr/*}
    318 cfa_includedir = $(CFA_INCDIR)
     317cfa_includedir = $(includedir)/cfa
    319318nobase_cfa_include_HEADERS = ${headers} ${stdhdr} concurrency/invoke.h
    320319CLEANFILES = libcfa-prelude.c
    … …  
    11611160
    11621161maintainer-clean-local:
    1163         -rm -rf ${includedir}/* ${libdir}/*
     1162        -rm -rf ${includedir}/*
    11641163
    11651164# Tell versions [3.59,3.63) of GNU make to not export all variables.

  • src/libcfa/iostream

    r2988eeb rc443d1d  
    1010// Created On       : Wed May 27 17:56:53 2015
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Mon Mar  6 20:51:35 2017
    13 // Update Count     : 98
     12// Last Modified On : Mon Mar  6 17:48:01 2017
     13// Update Count     : 97
    1414//
    1515

  • src/libcfa/iostream.c

    r2988eeb rc443d1d  
    1010// Created On       : Wed May 27 17:56:53 2015
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Mon Mar  6 20:52:02 2017
    13 // Update Count     : 313
     12// Last Modified On : Mon Mar  6 17:48:05 2017
     13// Update Count     : 312
    1414//
    1515

  • src/libcfa/stdlib

    r2988eeb rc443d1d  
    1010// Created On       : Thu Jan 28 17:12:35 2016
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Sat Mar  4 22:03:54 2017
    13 // Update Count     : 102
     12// Last Modified On : Fri Feb 24 21:07:16 2017
     13// Update Count     : 101
    1414//
    1515

  • src/libcfa/stdlib.c

    r2988eeb rc443d1d  
    1010// Created On       : Thu Jan 28 17:10:29 2016
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Sat Mar  4 22:02:22 2017
    13 // Update Count     : 172
     12// Last Modified On : Fri Feb 24 21:08:11 2017
     13// Update Count     : 171
    1414//
    1515

  • src/prelude/Makefile.am

    r2988eeb rc443d1d  
    1919
    2020# put into lib for now
    21 cfalibdir = ${CFA_LIBDIR}
     21cfalibdir = ${libdir}
    2222cfalib_DATA = builtins.cf extras.cf prelude.cf bootloader.c
    2323noinst_DATA = ../libcfa/libcfa-prelude.c

  • src/prelude/Makefile.in

    r2988eeb rc443d1d  
    105105CFA_INCDIR = @CFA_INCDIR@
    106106CFA_LIBDIR = @CFA_LIBDIR@
    107 CFA_NAME = @CFA_NAME@
    108107CFA_PREFIX = @CFA_PREFIX@
    109108CFLAGS = @CFLAGS@
    … …  
    210209
    211210# put into lib for now
    212 cfalibdir = ${CFA_LIBDIR}
     211cfalibdir = ${libdir}
    213212cfalib_DATA = builtins.cf extras.cf prelude.cf bootloader.c
    214213noinst_DATA = ../libcfa/libcfa-prelude.c

  • src/tests/Makefile.am

    r2988eeb rc443d1d  
    3030EXTRA_FLAGS =
    3131CFLAGS = -g -Wall -Wno-unused-function @CFA_FLAGS@ ${EXTRA_FLAGS}
    32 CC = @CFA_BINDIR@/@CFA_NAME@
     32CC = @CFA_BINDIR@/cfa
    3333
    3434.PHONY : list

  • src/tests/Makefile.in

    r2988eeb rc443d1d  
    113113AWK = @AWK@
    114114BACKEND_CC = @BACKEND_CC@
    115 CC = @CFA_BINDIR@/@CFA_NAME@
     115CC = @CFA_BINDIR@/cfa
    116116CCAS = @CCAS@
    117117CCASDEPMODE = @CCASDEPMODE@
    … …  
    123123CFA_INCDIR = @CFA_INCDIR@
    124124CFA_LIBDIR = @CFA_LIBDIR@
    125 CFA_NAME = @CFA_NAME@
    126125CFA_PREFIX = @CFA_PREFIX@
    127126CFLAGS = -g -Wall -Wno-unused-function @CFA_FLAGS@ ${EXTRA_FLAGS}
Note: See TracChangeset for help on using the changeset viewer.