Changes in / [04c8bba:58dd019]


Ignore:
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • configure

    r04c8bba r58dd019  
    658658CFA_INCDIR
    659659CFA_PREFIX
    660 BUILD_NO_LIB_FALSE
    661 BUILD_NO_LIB_TRUE
    662660BUILD_DEBUG_FALSE
    663661BUILD_DEBUG_TRUE
    … …  
    31483146                                ;;
    31493147                        no)
    3150                                 build_release="no"
    3151                                 build_debug="no"
     3148                                as_fn_error $? "Must build target debug or release" "$LINENO" 5
     3149                                exit 1;
    31523150                                ;;
    31533151                        *)
    … …  
    31893187  BUILD_DEBUG_TRUE='#'
    31903188  BUILD_DEBUG_FALSE=
    3191 fi
    3192 
    3193  if test "x$build_release$build_debug" = "xnono"; then
    3194   BUILD_NO_LIB_TRUE=
    3195   BUILD_NO_LIB_FALSE='#'
    3196 else
    3197   BUILD_NO_LIB_TRUE='#'
    3198   BUILD_NO_LIB_FALSE=
    31993189fi
    32003190
    … …  
    63146304if test -z "${BUILD_DEBUG_TRUE}" && test -z "${BUILD_DEBUG_FALSE}"; then
    63156305  as_fn_error $? "conditional \"BUILD_DEBUG\" was never defined.
    6316 Usually this means the macro was only invoked conditionally." "$LINENO" 5
    6317 fi
    6318 if test -z "${BUILD_NO_LIB_TRUE}" && test -z "${BUILD_NO_LIB_FALSE}"; then
    6319   as_fn_error $? "conditional \"BUILD_NO_LIB\" was never defined.
    63206306Usually this means the macro was only invoked conditionally." "$LINENO" 5
    63216307fi
    … …  
    76867672fi
    76877673else
    7688   if test -z "$BUILD_DEBUG_TRUE"; then :
    76897674  { $as_echo "$as_me:${as_lineno-$LINENO}: Building libcfa for target: debug" >&5
    76907675$as_echo "$as_me: Building libcfa for target: debug" >&6;}
    7691 else
    7692   { $as_echo "$as_me:${as_lineno-$LINENO}: Running cfa without libcfa" >&5
    7693 $as_echo "$as_me: Running cfa without libcfa" >&6;}
    7694 fi
    76957676fi
    76967677

  • configure.ac

    r04c8bba r58dd019  
    8282                                ;;
    8383                        no)
    84                                 build_release="no"
    85                                 build_debug="no"
     84                                AC_MSG_ERROR(Must build target debug or release)
     85                                exit 1;
    8686                                ;;
    8787                        *)
    … …  
    111111AM_CONDITIONAL([BUILD_RELEASE], [test "x$build_release" = "xyes"])
    112112AM_CONDITIONAL([BUILD_DEBUG], [test "x$build_debug" = "xyes"])
    113 AM_CONDITIONAL([BUILD_NO_LIB], [test "x$build_release$build_debug" = "xnono"])
    114113
    115114if test "x$prefix" = "xNONE"; then
    … …  
    201200                [AC_MSG_NOTICE(Building libcfa for target: release & debug)],
    202201                [AC_MSG_NOTICE(Building libcfa for target: release)])],
    203         [AM_COND_IF([BUILD_DEBUG],
    204                 [AC_MSG_NOTICE(Building libcfa for target: debug)],
    205                 [AC_MSG_NOTICE(Running cfa without libcfa)])])
     202        [AC_MSG_NOTICE(Building libcfa for target: debug)])
    206203
    207204# Final text

  • src/driver/Makefile.am

    r04c8bba r58dd019  
    1717# applies to both programs
    1818AM_CXXFLAGS = -Wall -O2
    19 if BUILD_NO_LIB
    20 else
    21 AM_CXXFLAGS += -DHAVE_LIBCFA
    22 endif
    23 if BUILD_DEBUG
    24 AM_CXXFLAGS += -DHAVE_LIBCFA_DEBUG
    25 endif
    26 if BUILD_RELEASE
    27 AM_CXXFLAGS += -DHAVE_LIBCFA_RELEASE
    28 endif
    2919
    3020bin_PROGRAMS = cfa

  • src/driver/Makefile.in

    r04c8bba r58dd019  
    3838build_triplet = @build@
    3939host_triplet = @host@
    40 @BUILD_NO_LIB_FALSE@am__append_1 = -DHAVE_LIBCFA
    41 @BUILD_DEBUG_TRUE@am__append_2 = -DHAVE_LIBCFA_DEBUG
    42 @BUILD_RELEASE_TRUE@am__append_3 = -DHAVE_LIBCFA_RELEASE
    4340bin_PROGRAMS = cfa$(EXEEXT)
    4441cc1lib_PROGRAMS = cc1$(EXEEXT)
    … …  
    207204
    208205# applies to both programs
    209 AM_CXXFLAGS = -Wall -O2 $(am__append_1) $(am__append_2) \
    210         $(am__append_3)
     206AM_CXXFLAGS = -Wall -O2
    211207cfa_SOURCES = cfa.cc
    212208

  • src/driver/cfa.cc

    r04c8bba r58dd019  
    231231        } // if
    232232
     233        string d;
     234        if ( debug ) {
     235                d = "-d";
     236        } // if
     237
    233238        // add the CFA include-library paths, which allow direct access to header files without directory qualification
     239
    234240        args[nargs] = "-I" CFA_INCDIR;
    235241        nargs += 1;
    … …  
    243249        nargs += 1;
    244250
    245 #ifdef HAVE_LIBCFA
    246251        if ( link ) {
    247                 #if ! defined(HAVE_LIBCFA_RELEASE)
    248                         if( !debug ) {
    249                                 cerr << "error: Option -nodebug is not available, libcfa was not installed." << endl;
    250                                 exit( EXIT_FAILURE );
    251                                 }
    252                 #endif
    253                 #if ! defined(HAVE_LIBCFA_DEBUG)
    254                         if( debug ) {
    255                                 cerr << "error: Option -debug is not available, libcfa-d was not installed." << endl;
    256                                 exit( EXIT_FAILURE );
    257                                 }
    258                 #endif
    259 
    260252                // include the cfa library in case it's needed
    261253                args[nargs] = "-L" CFA_LIBDIR;
    262254                nargs += 1;
    263                 if( debug ) {
    264                         args[nargs] = "-lcfa-d";
    265                 } else {
    266                         args[nargs] = "-lcfa";
    267                 }
    268                 nargs += 1;
    269         } // if
    270 #endif //HAVE_LIBCFA
     255                args[nargs] = "-lcfa";
     256                nargs += 1;
     257        } // if
    271258
    272259        // add the correct set of flags based on the type of compile this is

  • src/libcfa/Makefile.am

    r04c8bba r58dd019  
    1818AUTOMAKE_OPTIONS = subdir-objects
    1919
    20 lib_LIBRARIES =
    21 
    22 if BUILD_RELEASE
    23 lib_LIBRARIES += libcfa.a
    24 endif
    25 
    26 if BUILD_DEBUG
    27 lib_LIBRARIES += libcfa-d.a
    28 endif
     20lib_LIBRARIES = libcfa.a
    2921
    3022# put into lib for now
    … …  
    8678${libobjs} : ${abs_top_srcdir}/src/driver/cfa-cpp ${cfalib_DATA} # add dependency to cfa-cpp so all libraries are rebuilt with new translator
    8779
    88 libsrc = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c
    89 
    90 libcfa_a_SOURCES = ${libsrc}
    91 
    92 libcfa_d_a_SOURCES = ${libsrc}
     80libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c
    9381
    9482stdhdr = ${shell echo stdhdr/*}

  • src/libcfa/Makefile.in

    r04c8bba r58dd019  
    4040build_triplet = @build@
    4141host_triplet = @host@
    42 @BUILD_RELEASE_TRUE@am__append_1 = libcfa.a
    43 @BUILD_DEBUG_TRUE@am__append_2 = libcfa-d.a
    4442subdir = src/libcfa
    4543DIST_COMMON = $(nobase_include_HEADERS) $(srcdir)/Makefile.am \
    … …  
    9189am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
    9290am__v_at_0 = @
    93 libcfa_d_a_AR = $(AR) $(ARFLAGS)
    94 libcfa_d_a_LIBADD =
     91libcfa_a_AR = $(AR) $(ARFLAGS)
     92libcfa_a_LIBADD =
    9593am__dirstamp = $(am__leading_dot)dirstamp
    9694am__objects_1 = limits.$(OBJEXT) stdlib.$(OBJEXT) math.$(OBJEXT) \
    … …  
    9896        rational.$(OBJEXT) assert.$(OBJEXT) \
    9997        containers/vector.$(OBJEXT) concurrency/threads.$(OBJEXT)
    100 am__objects_2 = libcfa-prelude.$(OBJEXT) $(am__objects_1) \
     98am_libcfa_a_OBJECTS = libcfa-prelude.$(OBJEXT) $(am__objects_1) \
    10199        concurrency/CtxSwitch-@MACHINE_TYPE@.$(OBJEXT) \
    102100        concurrency/invoke.$(OBJEXT)
    103 am_libcfa_d_a_OBJECTS = $(am__objects_2)
    104 libcfa_d_a_OBJECTS = $(am_libcfa_d_a_OBJECTS)
    105 libcfa_a_AR = $(AR) $(ARFLAGS)
    106 libcfa_a_LIBADD =
    107 am_libcfa_a_OBJECTS = $(am__objects_2)
    108101libcfa_a_OBJECTS = $(am_libcfa_a_OBJECTS)
    109102DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
    … …  
    129122am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
    130123am__v_GEN_0 = @echo "  GEN   " $@;
    131 SOURCES = $(libcfa_d_a_SOURCES) $(libcfa_a_SOURCES)
    132 DIST_SOURCES = $(libcfa_d_a_SOURCES) $(libcfa_a_SOURCES)
     124SOURCES = $(libcfa_a_SOURCES)
     125DIST_SOURCES = $(libcfa_a_SOURCES)
    133126DATA = $(cfalib_DATA)
    134127HEADERS = $(nobase_include_HEADERS)
    … …  
    257250# create object files in directory with source files
    258251AUTOMAKE_OPTIONS = subdir-objects
    259 lib_LIBRARIES = $(am__append_1) $(am__append_2)
     252lib_LIBRARIES = libcfa.a
    260253
    261254# put into lib for now
    … …  
    275268runtimehdrs = concurrency
    276269libobjs = ${headers:=.o}
    277 libsrc = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c
    278 libcfa_a_SOURCES = ${libsrc}
    279 libcfa_d_a_SOURCES = ${libsrc}
     270libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c
    280271stdhdr = ${shell echo stdhdr/*}
    281272nobase_include_HEADERS = ${headers} ${stdhdr} concurrency/invoke.h
    … …  
    366357concurrency/invoke.$(OBJEXT): concurrency/$(am__dirstamp) \
    367358        concurrency/$(DEPDIR)/$(am__dirstamp)
    368 libcfa-d.a: $(libcfa_d_a_OBJECTS) $(libcfa_d_a_DEPENDENCIES) $(EXTRA_libcfa_d_a_DEPENDENCIES)
    369         $(AM_V_at)-rm -f libcfa-d.a
    370         $(AM_V_AR)$(libcfa_d_a_AR) libcfa-d.a $(libcfa_d_a_OBJECTS) $(libcfa_d_a_LIBADD)
    371         $(AM_V_at)$(RANLIB) libcfa-d.a
    372359libcfa.a: $(libcfa_a_OBJECTS) $(libcfa_a_DEPENDENCIES) $(EXTRA_libcfa_a_DEPENDENCIES)
    373360        $(AM_V_at)-rm -f libcfa.a
Note: See TracChangeset for help on using the changeset viewer.