Changeset 34a6b2e for libcfa


Ignore:
Timestamp:
Sep 25, 2018, 5:33:02 PM (6 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum
Children:
9ad5ee1
Parents:
461eed2 (diff), a32346b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

Location:
libcfa
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • libcfa/Makefile.in

    r461eed2 r34a6b2e  
    229229CFLAGS = @CFLAGS@
    230230CONFIGURATION = @CONFIGURATION@
     231CONFIG_BUILDLIB = @CONFIG_BUILDLIB@
    231232CONFIG_CFAFLAGS = @CONFIG_CFAFLAGS@
    232233CONFIG_CFLAGS = @CONFIG_CFLAGS@

  • libcfa/configure

    r461eed2 r34a6b2e  
    623623CFA_PREFIX
    624624CFA_NAME
     625BUILDLIB_FALSE
     626BUILDLIB_TRUE
     627CONFIG_BUILDLIB
    625628CONFIG_CFAFLAGS
    626629CONFIG_CFLAGS
    … …  
    25312534                CONFIG_CFLAGS="-O0 -g"
    25322535                CONFIG_CFAFLAGS="-debug"
     2536                CONFIG_BUILDLIB="yes"
    25332537        ;;
    25342538        "nodebug" )
    25352539                CONFIG_CFLAGS="-O2 -s"
    25362540                CONFIG_CFAFLAGS="-nodebug"
     2541                CONFIG_BUILDLIB="yes"
    25372542        ;;
    25382543        "nolib"   )
    2539                 CONFIG_CFLAGS=""
    2540                 CONFIG_CFAFLAGS=""
     2544                CONFIG_CFLAGS="-O2 -s"
     2545                CONFIG_CFAFLAGS="-nodebug"
     2546                CONFIG_BUILDLIB="no"
    25412547        ;;
    25422548esac
    25432549
    25442550
     2551
     2552
     2553
     2554 if test "x${CONFIG_BUILDLIB}" = "xyes"; then
     2555  BUILDLIB_TRUE=
     2556  BUILDLIB_FALSE='#'
     2557else
     2558  BUILDLIB_TRUE='#'
     2559  BUILDLIB_FALSE=
     2560fi
    25452561
    25462562
    … …  
    44784494fi
    44794495
     4496if test -z "${BUILDLIB_TRUE}" && test -z "${BUILDLIB_FALSE}"; then
     4497  as_fn_error $? "conditional \"BUILDLIB\" was never defined.
     4498Usually this means the macro was only invoked conditionally." "$LINENO" 5
     4499fi
    44804500if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
    44814501  as_fn_error $? "conditional \"AMDEP\" was never defined.

  • libcfa/configure.ac

    r461eed2 r34a6b2e  
    4141                CONFIG_CFLAGS="-O0 -g"
    4242                CONFIG_CFAFLAGS="-debug"
     43                CONFIG_BUILDLIB="yes"
    4344        ;;
    4445        "nodebug" )
    4546                CONFIG_CFLAGS="-O2 -s"
    4647                CONFIG_CFAFLAGS="-nodebug"
     48                CONFIG_BUILDLIB="yes"
    4749        ;;
    4850        "nolib"   )
    49                 CONFIG_CFLAGS=""
    50                 CONFIG_CFAFLAGS=""
     51                CONFIG_CFLAGS="-O2 -s"
     52                CONFIG_CFAFLAGS="-nodebug"
     53                CONFIG_BUILDLIB="no"
    5154        ;;
    5255esac
    … …  
    5457AC_SUBST(CONFIG_CFLAGS)
    5558AC_SUBST(CONFIG_CFAFLAGS)
     59AC_SUBST(CONFIG_BUILDLIB)
     60
     61AM_CONDITIONAL([BUILDLIB], [test "x${CONFIG_BUILDLIB}" = "xyes"])
    5662
    5763#==============================================================================

  • libcfa/prelude/Makefile.am

    r461eed2 r34a6b2e  
    2020# put into lib for now
    2121cfalibdir = ${CFA_LIBDIR}
    22 cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cf bootloader.c
    23 noinst_DATA = ../src/prelude.c
     22cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c
    2423
    2524CC = @CFACC@
    … …  
    4443        ${AM_V_GEN}gcc -I${srcdir} -E ${srcdir}/prototypes.c | awk -f ${srcdir}/prototypes.awk > $@
    4544
    46 prelude.cf : prelude-gen.cc
     45prelude.cfa : prelude-gen.cc
    4746        ${AM_V_GEN}${CXX} ${AM_CXXFLAGS} ${CXXFLAGS} ${AM_CFLAGS} ${<} -o prelude-gen -Wall -Wextra -O2 -g -std=c++14
    4847        @./prelude-gen > $@
    … …  
    6059include $(DEPDIR)/builtins.Po
    6160
    62 ../src/prelude.c : prelude.cf extras.cf gcc-builtins.cf builtins.cf @CFACPP@
    63         ${AM_V_GEN}@CFACPP@ --prelude-dir=${builddir} -l prelude.cf $@  # use src/cfa-cpp as not in lib until after install
    64 
    65 bootloader.c : ${srcdir}/bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf @CFACPP@
     61bootloader.c : ${srcdir}/bootloader.cf prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACPP@
    6662        ${AM_V_GEN}@CFACPP@ --prelude-dir=${builddir} -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
    6763
    … …  
    6965        rm -rf $(DEPDIR)
    7066
    71 MOSTLYCLEANFILES = bootloader.c builtins.cf extras.cf gcc-builtins.c gcc-builtins.cf prelude.cf
     67MOSTLYCLEANFILES = bootloader.c builtins.cf extras.cf gcc-builtins.c gcc-builtins.cf prelude.cfa
    7268MAINTAINERCLEANFILES = ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}

  • libcfa/prelude/Makefile.in

    r461eed2 r34a6b2e  
    147147  }
    148148am__installdirs = "$(DESTDIR)$(cfalibdir)"
    149 DATA = $(cfalib_DATA) $(noinst_DATA)
     149DATA = $(cfalib_DATA)
    150150am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
    151151am__DIST_COMMON = $(srcdir)/Makefile.in
    … …  
    174174CFLAGS = @CFLAGS@
    175175CONFIGURATION = @CONFIGURATION@
     176CONFIG_BUILDLIB = @CONFIG_BUILDLIB@
    176177CONFIG_CFAFLAGS = @CONFIG_CFAFLAGS@
    177178CONFIG_CFLAGS = @CONFIG_CFLAGS@
    … …  
    263264# put into lib for now
    264265cfalibdir = ${CFA_LIBDIR}
    265 cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cf bootloader.c
    266 noinst_DATA = ../src/prelude.c
     266cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c
    267267AM_CFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
    268268AM_CFAFLAGS = @CONFIG_CFAFLAGS@
    269 MOSTLYCLEANFILES = bootloader.c builtins.cf extras.cf gcc-builtins.c gcc-builtins.cf prelude.cf
     269MOSTLYCLEANFILES = bootloader.c builtins.cf extras.cf gcc-builtins.c gcc-builtins.cf prelude.cfa
    270270MAINTAINERCLEANFILES = ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
    271271all: all-am
    … …  
    499499        ${AM_V_GEN}gcc -I${srcdir} -E ${srcdir}/prototypes.c | awk -f ${srcdir}/prototypes.awk > $@
    500500
    501 prelude.cf : prelude-gen.cc
     501prelude.cfa : prelude-gen.cc
    502502        ${AM_V_GEN}${CXX} ${AM_CXXFLAGS} ${CXXFLAGS} ${AM_CFLAGS} ${<} -o prelude-gen -Wall -Wextra -O2 -g -std=c++14
    503503        @./prelude-gen > $@
    … …  
    515515include $(DEPDIR)/builtins.Po
    516516
    517 ../src/prelude.c : prelude.cf extras.cf gcc-builtins.cf builtins.cf @CFACPP@
    518         ${AM_V_GEN}@CFACPP@ --prelude-dir=${builddir} -l prelude.cf $@  # use src/cfa-cpp as not in lib until after install
    519 
    520 bootloader.c : ${srcdir}/bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf @CFACPP@
     517bootloader.c : ${srcdir}/bootloader.cf prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACPP@
    521518        ${AM_V_GEN}@CFACPP@ --prelude-dir=${builddir} -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
    522519

  • libcfa/prelude/prelude-gen.cc

    r461eed2 r34a6b2e  
    142142
    143143int main() {
    144         cout << "# 2 \"prelude.cf\"  // needed for error messages from this file" << endl;
     144        cout << "# 2 \"prelude.cfa\"  // needed for error messages from this file" << endl;
    145145        cout << "trait sized(dtype T) {};" << endl;
    146146

  • libcfa/src/Makefile.am

    r461eed2 r34a6b2e  
    1616
    1717# create object files in directory with source files
    18 AUTOMAKE_OPTIONS = subdir-objects
     18AUTOMAKE_OPTIONS = foreign subdir-objects
    1919ARFLAGS = cr
    2020
    … …  
    2424lib_LIBRARIES =  libcfa.a
    2525
     26VPATH += :../prelude
     27
    2628# AM_CFLAGS for all cfa source
    2729# AM_CFAFLAGS for only cfa source
    2830# use -no-include-stdhdr to prevent rebuild cycles
    2931# The built sources must not depend on the installed headers
    30 AM_CFAFLAGS = -quiet -in-tree -imacros prelude.c -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
     32AM_CFAFLAGS = -quiet -in-tree -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
    3133AM_CFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
    3234AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
    … …  
    3436
    3537#----------------------------------------------------------------------------------------------------------------
     38if BUILDLIB
    3639headers = fstream.hfa iostream.hfa iterator.hfa limits.hfa rational.hfa time.hfa stdlib.hfa common.hfa \
    3740          containers/maybe.hfa containers/pair.hfa containers/result.hfa containers/vector.hfa
     41
     42headers_nosrc = math.hfa gmp.hfa time_t.hfa bits/align.hfa bits/containers.hfa bits/defs.hfa bits/debug.hfa bits/locks.hfa
    3843
    3944# not all platforms support concurrency, add option do disable it
    4045headers += concurrency/coroutine.hfa concurrency/thread.hfa concurrency/kernel.hfa concurrency/monitor.hfa concurrency/mutex.hfa
    4146
    42 libobjs = ${headers:.hfa=.o}
    43 libsrc = prelude.c startup.cfa interpose.cfa bits/debug.cfa assert.cfa exception.c virtual.c heap.cfa \
    44         ${headers:.hfa=.cfa}
     47headers_nosrc += concurrency/invoke.h
     48
     49libsrc = startup.cfa interpose.cfa bits/debug.cfa assert.cfa exception.c virtual.c heap.cfa ${headers:.hfa=.cfa}
    4550
    4651# not all platforms support concurrency, add option do disable it
    4752libsrc += concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa concurrency/invoke.c concurrency/preemption.cfa
     53else
     54headers =
     55headers_nosrc =
     56libsrc =
     57endif
     58
    4859
    4960#----------------------------------------------------------------------------------------------------------------
    5061# add dependency to cfa-cpp so all libraries are rebuilt with new translator
    51 ${libobjs} : ${cfalib_DATA}
     62#@CFACC@ @CFACPP@ prelude.cfa
    5263
    53 libcfa_a_SOURCES = ${libsrc}
     64# add dependency of cfa files
     65libobjs = $(addsuffix .o, $(basename $(filter %.cfa,$(libsrc))))
     66$(libobjs) : @CFACC@ @CFACPP@ prelude.cfa
     67
     68
     69# .deps inclusion is not done automatically by automake for new languages
     70libdeps = $(join \
     71        $(addsuffix $(DEPDIR)/ , $(dir $(libobjs) ) ), \
     72        $(notdir ${libobjs:.o=.Po}) \
     73)
     74
     75-include $(libdeps)
     76
     77prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
     78        ${AM_V_GEN}@CFACC@ ${AM_CFLAGS} ${CFLAGS} -quiet -in-tree -XCFA -l ${<} -c -o ${@}
     79
     80
     81
     82#----------------------------------------------------------------------------------------------------------------
     83libcfa_a_SOURCES = prelude.cfa ${libsrc}
    5484
    5585stdhdr = ${shell find ${srcdir}/stdhdr -type f -printf "%p "}
    5686
    5787cfa_includedir = $(CFA_INCDIR)
    58 nobase_cfa_include_HEADERS = \
    59         ${headers}             \
    60         ${stdhdr}              \
    61         math.hfa               \
    62         gmp.hfa                \
    63         time_t.hfa             \
    64         bits/align.hfa         \
    65         bits/containers.hfa    \
    66         bits/defs.hfa          \
    67         bits/debug.hfa         \
    68         bits/locks.hfa         \
    69         concurrency/invoke.h
    70 
    71 MOSTLYCLEANFILES = prelude.c
     88nobase_cfa_include_HEADERS = ${stdhdr} ${headers} ${headers_nosrc}
    7289
    7390#----------------------------------------------------------------------------------------------------------------
    7491maintainer-clean-local:
    7592        -rm -rf ${CFA_INCDIR} ${CFA_LIBDIR}
     93
     94
     95# $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
     96#       $(CFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     97#       $(am__mv) $$depbase.Tpo $$depbase.Po

  • libcfa/src/Makefile.in

    r461eed2 r34a6b2e  
    1919
    2020
    21 VPATH = @srcdir@
    2221am__is_gnu_make = { \
    2322  if test -z '$(MAKELEVEL)'; then \
    … …  
    9796am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    9897        $(ACLOCAL_M4)
    99 DIST_COMMON = $(srcdir)/Makefile.am $(nobase_cfa_include_HEADERS) \
    100         $(am__DIST_COMMON)
     98DIST_COMMON = $(srcdir)/Makefile.am \
     99        $(am__nobase_cfa_include_HEADERS_DIST) $(am__DIST_COMMON)
    101100mkinstalldirs = $(install_sh) -d
    102101CONFIG_CLEAN_FILES =
    … …  
    138137libcfa_a_AR = $(AR) $(ARFLAGS)
    139138libcfa_a_LIBADD =
     139am__libcfa_a_SOURCES_DIST = prelude.cfa startup.cfa interpose.cfa \
     140        bits/debug.cfa assert.cfa exception.c virtual.c heap.cfa \
     141        fstream.cfa iostream.cfa iterator.cfa limits.cfa rational.cfa \
     142        time.cfa stdlib.cfa common.cfa containers/maybe.cfa \
     143        containers/pair.cfa containers/result.cfa \
     144        containers/vector.cfa concurrency/coroutine.cfa \
     145        concurrency/thread.cfa concurrency/kernel.cfa \
     146        concurrency/monitor.cfa concurrency/mutex.cfa \
     147        concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa \
     148        concurrency/invoke.c concurrency/preemption.cfa
    140149am__dirstamp = $(am__leading_dot)dirstamp
    141 am__objects_1 = fstream.$(OBJEXT) iostream.$(OBJEXT) \
    142         iterator.$(OBJEXT) limits.$(OBJEXT) rational.$(OBJEXT) \
    143         time.$(OBJEXT) stdlib.$(OBJEXT) common.$(OBJEXT) \
    144         containers/maybe.$(OBJEXT) containers/pair.$(OBJEXT) \
    145         containers/result.$(OBJEXT) containers/vector.$(OBJEXT) \
    146         concurrency/coroutine.$(OBJEXT) concurrency/thread.$(OBJEXT) \
    147         concurrency/kernel.$(OBJEXT) concurrency/monitor.$(OBJEXT) \
    148         concurrency/mutex.$(OBJEXT)
    149 am__objects_2 = prelude.$(OBJEXT) startup.$(OBJEXT) \
    150         interpose.$(OBJEXT) bits/debug.$(OBJEXT) assert.$(OBJEXT) \
    151         exception.$(OBJEXT) virtual.$(OBJEXT) heap.$(OBJEXT) \
    152         $(am__objects_1) \
    153         concurrency/CtxSwitch-@ARCHITECTURE@.$(OBJEXT) \
    154         concurrency/alarm.$(OBJEXT) concurrency/invoke.$(OBJEXT) \
    155         concurrency/preemption.$(OBJEXT)
    156 am_libcfa_a_OBJECTS = $(am__objects_2)
     150@BUILDLIB_TRUE@am__objects_1 = fstream.$(OBJEXT) iostream.$(OBJEXT) \
     151@BUILDLIB_TRUE@ iterator.$(OBJEXT) limits.$(OBJEXT) \
     152@BUILDLIB_TRUE@ rational.$(OBJEXT) time.$(OBJEXT) \
     153@BUILDLIB_TRUE@ stdlib.$(OBJEXT) common.$(OBJEXT) \
     154@BUILDLIB_TRUE@ containers/maybe.$(OBJEXT) \
     155@BUILDLIB_TRUE@ containers/pair.$(OBJEXT) \
     156@BUILDLIB_TRUE@ containers/result.$(OBJEXT) \
     157@BUILDLIB_TRUE@ containers/vector.$(OBJEXT) \
     158@BUILDLIB_TRUE@ concurrency/coroutine.$(OBJEXT) \
     159@BUILDLIB_TRUE@ concurrency/thread.$(OBJEXT) \
     160@BUILDLIB_TRUE@ concurrency/kernel.$(OBJEXT) \
     161@BUILDLIB_TRUE@ concurrency/monitor.$(OBJEXT) \
     162@BUILDLIB_TRUE@ concurrency/mutex.$(OBJEXT)
     163@BUILDLIB_TRUE@am__objects_2 = startup.$(OBJEXT) interpose.$(OBJEXT) \
     164@BUILDLIB_TRUE@ bits/debug.$(OBJEXT) assert.$(OBJEXT) \
     165@BUILDLIB_TRUE@ exception.$(OBJEXT) virtual.$(OBJEXT) \
     166@BUILDLIB_TRUE@ heap.$(OBJEXT) $(am__objects_1) \
     167@BUILDLIB_TRUE@ concurrency/CtxSwitch-@ARCHITECTURE@.$(OBJEXT) \
     168@BUILDLIB_TRUE@ concurrency/alarm.$(OBJEXT) \
     169@BUILDLIB_TRUE@ concurrency/invoke.$(OBJEXT) \
     170@BUILDLIB_TRUE@ concurrency/preemption.$(OBJEXT)
     171am_libcfa_a_OBJECTS = prelude.$(OBJEXT) $(am__objects_2)
    157172libcfa_a_OBJECTS = $(am_libcfa_a_OBJECTS)
    158173AM_V_P = $(am__v_P_@AM_V@)
    … …  
    191206am__v_CCLD_1 =
    192207SOURCES = $(libcfa_a_SOURCES)
    193 DIST_SOURCES = $(libcfa_a_SOURCES)
     208DIST_SOURCES = $(am__libcfa_a_SOURCES_DIST)
    194209am__can_run_installinfo = \
    195210  case $$AM_UPDATE_INFO_DIR in \
    … …  
    197212    *) (install-info --version) >/dev/null 2>&1;; \
    198213  esac
     214am__nobase_cfa_include_HEADERS_DIST = ${shell find ${srcdir}/stdhdr \
     215        -type f -printf "%p "} fstream.hfa iostream.hfa iterator.hfa \
     216        limits.hfa rational.hfa time.hfa stdlib.hfa common.hfa \
     217        containers/maybe.hfa containers/pair.hfa containers/result.hfa \
     218        containers/vector.hfa concurrency/coroutine.hfa \
     219        concurrency/thread.hfa concurrency/kernel.hfa \
     220        concurrency/monitor.hfa concurrency/mutex.hfa math.hfa gmp.hfa \
     221        time_t.hfa bits/align.hfa bits/containers.hfa bits/defs.hfa \
     222        bits/debug.hfa bits/locks.hfa concurrency/invoke.h
    199223HEADERS = $(nobase_cfa_include_HEADERS)
    200224am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
    … …  
    220244        $(top_srcdir)/./automake/depcomp
    221245DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
     246VPATH = @srcdir@ :../prelude
    222247ACLOCAL = @ACLOCAL@
    223248AMTAR = @AMTAR@
    … …  
    243268CFLAGS = @CFLAGS@
    244269CONFIGURATION = @CONFIGURATION@
     270CONFIG_BUILDLIB = @CONFIG_BUILDLIB@
    245271CONFIG_CFAFLAGS = @CONFIG_CFAFLAGS@
    246272CONFIG_CFLAGS = @CONFIG_CFLAGS@
    … …  
    328354
    329355# create object files in directory with source files
    330 AUTOMAKE_OPTIONS = subdir-objects
     356AUTOMAKE_OPTIONS = foreign subdir-objects
    331357ARFLAGS = cr
    332358CFACOMPILE = $(CFACC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) $(AM_CFLAGS) $(CFLAGS)
    … …  
    341367# use -no-include-stdhdr to prevent rebuild cycles
    342368# The built sources must not depend on the installed headers
    343 AM_CFAFLAGS = -quiet -in-tree -imacros prelude.c -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
     369AM_CFAFLAGS = -quiet -in-tree -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
    344370AM_CFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
    345371AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
     372@BUILDLIB_FALSE@headers =
    346373
    347374#----------------------------------------------------------------------------------------------------------------
    348375
    349376# not all platforms support concurrency, add option do disable it
    350 headers = fstream.hfa iostream.hfa iterator.hfa limits.hfa \
    351         rational.hfa time.hfa stdlib.hfa common.hfa \
    352         containers/maybe.hfa containers/pair.hfa containers/result.hfa \
    353         containers/vector.hfa concurrency/coroutine.hfa \
    354         concurrency/thread.hfa concurrency/kernel.hfa \
    355         concurrency/monitor.hfa concurrency/mutex.hfa
    356 libobjs = ${headers:.hfa=.o}
     377@BUILDLIB_TRUE@headers = fstream.hfa iostream.hfa iterator.hfa \
     378@BUILDLIB_TRUE@ limits.hfa rational.hfa time.hfa stdlib.hfa \
     379@BUILDLIB_TRUE@ common.hfa containers/maybe.hfa \
     380@BUILDLIB_TRUE@ containers/pair.hfa containers/result.hfa \
     381@BUILDLIB_TRUE@ containers/vector.hfa concurrency/coroutine.hfa \
     382@BUILDLIB_TRUE@ concurrency/thread.hfa concurrency/kernel.hfa \
     383@BUILDLIB_TRUE@ concurrency/monitor.hfa concurrency/mutex.hfa
     384@BUILDLIB_FALSE@headers_nosrc =
     385@BUILDLIB_TRUE@headers_nosrc = math.hfa gmp.hfa time_t.hfa \
     386@BUILDLIB_TRUE@ bits/align.hfa bits/containers.hfa \
     387@BUILDLIB_TRUE@ bits/defs.hfa bits/debug.hfa bits/locks.hfa \
     388@BUILDLIB_TRUE@ concurrency/invoke.h
     389@BUILDLIB_FALSE@libsrc =
    357390
    358391# not all platforms support concurrency, add option do disable it
    359 libsrc = prelude.c startup.cfa interpose.cfa bits/debug.cfa assert.cfa \
    360         exception.c virtual.c heap.cfa ${headers:.hfa=.cfa} \
    361         concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa \
    362         concurrency/invoke.c concurrency/preemption.cfa
    363 libcfa_a_SOURCES = ${libsrc}
     392@BUILDLIB_TRUE@libsrc = startup.cfa interpose.cfa bits/debug.cfa \
     393@BUILDLIB_TRUE@ assert.cfa exception.c virtual.c heap.cfa \
     394@BUILDLIB_TRUE@ ${headers:.hfa=.cfa} \
     395@BUILDLIB_TRUE@ concurrency/CtxSwitch-@ARCHITECTURE@.S \
     396@BUILDLIB_TRUE@ concurrency/alarm.cfa concurrency/invoke.c \
     397@BUILDLIB_TRUE@ concurrency/preemption.cfa
     398
     399#----------------------------------------------------------------------------------------------------------------
     400# add dependency to cfa-cpp so all libraries are rebuilt with new translator
     401#@CFACC@ @CFACPP@ prelude.cfa
     402
     403# add dependency of cfa files
     404libobjs = $(addsuffix .o, $(basename $(filter %.cfa,$(libsrc))))
     405
     406# .deps inclusion is not done automatically by automake for new languages
     407libdeps = $(join \
     408        $(addsuffix $(DEPDIR)/ , $(dir $(libobjs) ) ), \
     409        $(notdir ${libobjs:.o=.Po}) \
     410)
     411
     412
     413#----------------------------------------------------------------------------------------------------------------
     414libcfa_a_SOURCES = prelude.cfa ${libsrc}
    364415stdhdr = ${shell find ${srcdir}/stdhdr -type f -printf "%p "}
    365416cfa_includedir = $(CFA_INCDIR)
    366 nobase_cfa_include_HEADERS = \
    367         ${headers}             \
    368         ${stdhdr}              \
    369         math.hfa               \
    370         gmp.hfa                \
    371         time_t.hfa             \
    372         bits/align.hfa         \
    373         bits/containers.hfa    \
    374         bits/defs.hfa          \
    375         bits/debug.hfa         \
    376         bits/locks.hfa         \
    377         concurrency/invoke.h
    378 
    379 MOSTLYCLEANFILES = prelude.c
     417nobase_cfa_include_HEADERS = ${stdhdr} ${headers} ${headers_nosrc}
    380418all: all-am
    381419
    … …  
    506544
    507545@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exception.Po@am__quote@
    508 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prelude.Po@am__quote@
    509546@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/virtual.Po@am__quote@
    510547@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/CtxSwitch-@ARCHITECTURE@.Po@am__quote@
    … …  
    676713        fi
    677714mostlyclean-generic:
    678         -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
    679715
    680716clean-generic:
    … …  
    784820
    785821
    786 .cfa.o: $(CFACC) $(CFACPP)
     822.cfa.o:
    787823        $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
    788824        $(CFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
    789825        $(am__mv) $$depbase.Tpo $$depbase.Po
    790 
    791 #----------------------------------------------------------------------------------------------------------------
    792 # add dependency to cfa-cpp so all libraries are rebuilt with new translator
    793 ${libobjs} : ${cfalib_DATA}
     826$(libobjs) : @CFACC@ @CFACPP@ prelude.cfa
     827
     828-include $(libdeps)
     829
     830prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
     831        ${AM_V_GEN}@CFACC@ ${AM_CFLAGS} ${CFLAGS} -quiet -in-tree -XCFA -l ${<} -c -o ${@}
    794832
    795833#----------------------------------------------------------------------------------------------------------------
    … …  
    797835        -rm -rf ${CFA_INCDIR} ${CFA_LIBDIR}
    798836
     837# $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
     838#       $(CFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     839#       $(am__mv) $$depbase.Tpo $$depbase.Po
     840
    799841# Tell versions [3.59,3.63) of GNU make to not export all variables.
    800842# Otherwise a system limit (for SysV at least) may be exceeded.
Note: See TracChangeset for help on using the changeset viewer.