Changeset 534e4e4


Ignore:
Timestamp:
Aug 3, 2018, 4:05:38 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:
4dcaed2
Parents:
ba9baad
Message:

Some clean-up before tackling finding directories

Files:
1 added
10 edited

Legend:

Unmodified
Added
Removed
  • Makefile.in

    rba9baad r534e4e4  
    9494subdir = .
    9595ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    96 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
     96am__aclocal_m4_deps = $(top_srcdir)/automake/cfa.m4 \
     97        $(top_srcdir)/configure.ac
    9798am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    9899        $(ACLOCAL_M4)
  • benchmark/Makefile.in

    rba9baad r534e4e4  
    9595subdir = benchmark
    9696ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    97 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
     97am__aclocal_m4_deps = $(top_srcdir)/automake/cfa.m4 \
     98        $(top_srcdir)/configure.ac
    9899am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    99100        $(ACLOCAL_M4)
  • configure

    rba9baad r534e4e4  
    25202520
    25212521
     2522
     2523
     2524
    25222525am__api_version='1.15'
    25232526
     
    32173220#==============================================================================
    32183221# Installation paths
    3219 if test "x$prefix" = "xNONE"; then
    3220         cfa_prefix=${ac_default_prefix}
    3221 else
    3222         cfa_prefix=${prefix}
    3223 fi
     3222
     3223        if test "x$prefix" = "xNONE"; then
     3224                cfa_prefix=${ac_default_prefix}
     3225        else
     3226                cfa_prefix=${prefix}
     3227        fi
    32243228
    32253229cat >>confdefs.h <<_ACEOF
     
    32273231_ACEOF
    32283232
    3229 CFA_PREFIX=${cfa_prefix}
    3230 
    3231 
    3232 if test "$includedir" = '${prefix}/include'; then
    3233         cfa_incdir="${cfa_prefix}/include/${cfa_name}"
    3234 else
    3235         cfa_incdir=${includedir}
    3236 fi
     3233        CFA_PREFIX=${cfa_prefix}
     3234
     3235
     3236        if test "$includedir" = '${prefix}/include'; then
     3237                cfa_incdir="${cfa_prefix}/include/${cfa_name}"
     3238        else
     3239                cfa_incdir=${includedir}
     3240        fi
    32373241
    32383242cat >>confdefs.h <<_ACEOF
     
    32403244_ACEOF
    32413245
    3242 CFA_INCDIR=${cfa_incdir}
    3243 
    3244 
    3245 if test "$bindir" = '${exec_prefix}/bin'; then
    3246         cfa_bindir="${cfa_prefix}/bin"
    3247 else
    3248         cfa_bindir=${bindir}
    3249 fi
     3246        CFA_INCDIR=${cfa_incdir}
     3247
     3248
     3249        if test "$bindir" = '${exec_prefix}/bin'; then
     3250                cfa_bindir="${cfa_prefix}/bin"
     3251        else
     3252                cfa_bindir=${bindir}
     3253        fi
    32503254
    32513255cat >>confdefs.h <<_ACEOF
     
    32533257_ACEOF
    32543258
    3255 CFA_BINDIR=${cfa_bindir}
    3256 
    3257 
    3258 if test "$libdir" = '${exec_prefix}/lib'; then
    3259         cfa_libdir="${cfa_prefix}/lib/${cfa_name}"
    3260 else
    3261         cfa_libdir=${libdir}
    3262 fi
     3259        CFA_BINDIR=${cfa_bindir}
     3260
     3261
     3262        if test "$libdir" = '${exec_prefix}/lib'; then
     3263                cfa_libdir="${cfa_prefix}/lib/${cfa_name}"
     3264        else
     3265                cfa_libdir=${libdir}
     3266        fi
    32633267
    32643268cat >>confdefs.h <<_ACEOF
     
    32663270_ACEOF
    32673271
    3268 CFA_LIBDIR=${cfa_libdir}
     3272        CFA_LIBDIR=${cfa_libdir}
     3273
    32693274
    32703275
     
    33103315do
    33113316        #strip quotes surrouding values
    3312         var=$(echo $var | sed s/\'//g)
    33133317        case $var in
    33143318                # skip cross compilation related arguments
    3315                 --host=*) ;; host_alias=*) ;; --build=*) ;; build_alias=*) ;; --target=*) ;; target_alias=*) ;;
     3319                \'--host=*) ;; \'host_alias=*) ;; \'--build=*) ;; \'build_alias=*) ;; \'--target=*) ;; \'target_alias=*) ;;
    33163320
    33173321                # skip the target hosts
    3318                 --with-target-hosts=*) ;;
     3322                \'--with-target-hosts=*) ;;
    33193323
    33203324                # append all other arguments to the sub configure arguments
     
    34153419do
    34163420        # call your procedure/other scripts here below
    3417         lib_arch=$(echo $i | sed -r "s/:(.*)//g")
     3421        arch_name=$(echo $i | sed -r "s/:(.*)//g")
    34183422        lib_config=$(echo $i | sed -r "s/(.*)://g")
     3423        if test $lib_config != "nodebug";
     3424        then
     3425                if test $lib_config != "debug";
     3426                then
     3427                        if test $lib_config != "nolib";
     3428                        then
     3429                                >&2 echo "Configuration must be 'debug', 'nodebug' or 'nolib'"
     3430                                exit 1
     3431                        fi
     3432                fi
     3433        fi
     3434
     3435        lib_arch=$($ac_aux_dir/config.sub $arch_name)
     3436        if test "$?" != "0"; then
     3437                >&2 echo "Unkown architecture " $arch_name;
     3438                exit 1;
     3439        fi
    34193440        lib_dir="libcfa-${lib_arch}-${lib_config}"
    34203441
  • configure.ac

    rba9baad r534e4e4  
    88AC_CONFIG_HEADERS([config.h:src/config.h.in])
    99AM_SILENT_RULES([no])
     10
     11m4_include([automake/cfa.m4])
    1012
    1113AM_INIT_AUTOMAKE([subdir-objects])
     
    8183#==============================================================================
    8284# Installation paths
    83 if test "x$prefix" = "xNONE"; then
    84         cfa_prefix=${ac_default_prefix}
    85 else
    86         cfa_prefix=${prefix}
    87 fi
    88 AC_DEFINE_UNQUOTED(CFA_PREFIX, "${cfa_prefix}", [Location of cfa install.])
    89 AC_SUBST(CFA_PREFIX, ${cfa_prefix})
    90 
    91 if test "$includedir" = '${prefix}/include'; then
    92         cfa_incdir="${cfa_prefix}/include/${cfa_name}"
    93 else
    94         cfa_incdir=${includedir}
    95 fi
    96 AC_DEFINE_UNQUOTED(CFA_INCDIR, "${cfa_incdir}", [Location of include files.])
    97 AC_SUBST(CFA_INCDIR, ${cfa_incdir})
    98 
    99 if test "$bindir" = '${exec_prefix}/bin'; then
    100         cfa_bindir="${cfa_prefix}/bin"
    101 else
    102         cfa_bindir=${bindir}
    103 fi
    104 AC_DEFINE_UNQUOTED(CFA_BINDIR, "${cfa_bindir}", [Location of cfa command.])
    105 AC_SUBST(CFA_BINDIR, ${cfa_bindir})
    106 
    107 if test "$libdir" = '${exec_prefix}/lib'; then
    108         cfa_libdir="${cfa_prefix}/lib/${cfa_name}"
    109 else
    110         cfa_libdir=${libdir}
    111 fi
    112 AC_DEFINE_UNQUOTED(CFA_LIBDIR, "${cfa_libdir}", [Location of cc1 and cfa-cpp commands.])
    113 AC_SUBST(CFA_LIBDIR, ${cfa_libdir})
     85M4CFA_PARSE_PREFIX
    11486
    11587#==============================================================================
     
    142114do
    143115        #strip quotes surrouding values
    144         var=$(echo $var | sed s/\'//g)
    145116        case $var in
    146117                # skip cross compilation related arguments
    147                 --host=*) ;; host_alias=*) ;; --build=*) ;; build_alias=*) ;; --target=*) ;; target_alias=*) ;;
     118                \'--host=*) ;; \'host_alias=*) ;; \'--build=*) ;; \'build_alias=*) ;; \'--target=*) ;; \'target_alias=*) ;;
    148119
    149120                # skip the target hosts
    150                 --with-target-hosts=*) ;;
     121                \'--with-target-hosts=*) ;;
    151122
    152123                # append all other arguments to the sub configure arguments
     
    172143do
    173144        # call your procedure/other scripts here below
    174         lib_arch=$(echo $i | sed -r "s/:(.*)//g")
     145        arch_name=$(echo $i | sed -r "s/:(.*)//g")
    175146        lib_config=$(echo $i | sed -r "s/(.*)://g")
     147        if test $lib_config != "nodebug";
     148        then
     149                if test $lib_config != "debug";
     150                then
     151                        if test $lib_config != "nolib";
     152                        then
     153                                >&2 echo "Configuration must be 'debug', 'nodebug' or 'nolib'"
     154                                exit 1
     155                        fi
     156                fi
     157        fi
     158
     159        lib_arch=$($ac_aux_dir/config.sub $arch_name)
     160        if test "$?" != "0"; then
     161                >&2 echo "Unkown architecture " $arch_name;
     162                exit 1;
     163        fi
    176164        lib_dir="libcfa-${lib_arch}-${lib_config}"
    177165
  • driver/Makefile.in

    rba9baad r534e4e4  
    9696subdir = driver
    9797ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    98 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
     98am__aclocal_m4_deps = $(top_srcdir)/automake/cfa.m4 \
     99        $(top_srcdir)/configure.ac
    99100am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    100101        $(ACLOCAL_M4)
  • src/Makefile.in

    rba9baad r534e4e4  
    137137subdir = src
    138138ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    139 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
     139am__aclocal_m4_deps = $(top_srcdir)/automake/cfa.m4 \
     140        $(top_srcdir)/configure.ac
    140141am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    141142        $(ACLOCAL_M4)
  • tests/Makefile.in

    rba9baad r534e4e4  
    9494subdir = tests
    9595ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    96 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
     96am__aclocal_m4_deps = $(top_srcdir)/automake/cfa.m4 \
     97        $(top_srcdir)/configure.ac
    9798am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    9899        $(ACLOCAL_M4)
  • tests/preempt_longrun/Makefile.in

    rba9baad r534e4e4  
    9393subdir = tests/preempt_longrun
    9494ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    95 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
     95am__aclocal_m4_deps = $(top_srcdir)/automake/cfa.m4 \
     96        $(top_srcdir)/configure.ac
    9697am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    9798        $(ACLOCAL_M4)
  • tools/Makefile.in

    rba9baad r534e4e4  
    9696subdir = tools
    9797ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    98 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
     98am__aclocal_m4_deps = $(top_srcdir)/automake/cfa.m4 \
     99        $(top_srcdir)/configure.ac
    99100am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    100101        $(ACLOCAL_M4)
  • tools/prettyprinter/Makefile.in

    rba9baad r534e4e4  
    9595subdir = tools/prettyprinter
    9696ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    97 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
     97am__aclocal_m4_deps = $(top_srcdir)/automake/cfa.m4 \
     98        $(top_srcdir)/configure.ac
    9899am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    99100        $(ACLOCAL_M4)
Note: See TracChangeset for help on using the changeset viewer.