Ignore:
Timestamp:
Aug 3, 2018, 2:50:12 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:
534e4e4
Parents:
ff1e0f38
Message:

Simplified some of the handling by converting libcfa sources from .c to .cfa

File:
1 edited

Legend:

Unmodified
Added
Removed
  • libcfa/src/Makefile.am

    rff1e0f38 rba9baad  
    1919ARFLAGS = cr
    2020
     21include $(srcdir)/../../src/cfa.make
     22
    2123libdir = ${CFA_LIBDIR}
    2224lib_LIBRARIES =  libcfa.a
    2325
    24 libcfa-prelude.o : libcfa-prelude.c
    25          ${AM_V_GEN}gcc  -Wall -O2 -c -o $@ $<
    26 
    27 EXTRA_FLAGS = -g -Wall -Wno-unused-function -imacros libcfa-prelude.c  $(DEFAULT_INCLUDES)
    28 
    29 AM_CCASFLAGS =
    30 
    31 #CFLAGS for most libcfa src
    32 #use -no-include-stdhdr to prevent rebuild cycles
    33 #The built sources must not depend on the installed headers
    34 CFLAGS = -quiet -no-include-stdhdr -XCFA -t -B@DRIVER_DIR@ ${EXTRA_FLAGS}
    35 CC = @CFACC@
     26# AM_CFLAGS for all cfa source
     27# AM_CFAFLAGS for only cfa source
     28# use -no-include-stdhdr to prevent rebuild cycles
     29# The built sources must not depend on the installed headers
     30AM_CFAFLAGS = -quiet -no-include-stdhdr -XCFA -t -B@DRIVER_DIR@ -imacros prelude.c -I$(srcdir)/stdhdr
     31AM_CFLAGS = -g -Wall -Wno-unused-function
     32CFACC = @CFACC@
    3633
    3734headers = fstream iostream iterator limits rational time stdlib common \
     
    4239
    4340libobjs = ${headers:=.o}
    44 libsrc = libcfa-prelude.c startup.c interpose.c bits/debug.c assert.c exception.c virtual.c heap.c \
    45         ${headers:=.c}
     41libsrc = prelude.c startup.cfa interpose.cfa bits/debug.cfa assert.cfa exception.c virtual.c heap.cfa \
     42        ${headers:=.cfa}
    4643
    4744# not all platforms support concurrency, add option do disable it
    48 libsrc += concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/alarm.c concurrency/invoke.c concurrency/preemption.c
     45libsrc += concurrency/CtxSwitch-@host_alias@.S concurrency/alarm.cfa concurrency/invoke.c concurrency/preemption.cfa
    4946
    5047# extensionless header files are overridden by -o flag in default makerule => explicitly override default rule to silently do nothing
     
    5956        false
    6057
    61 concurrency/invoke.o : concurrency/invoke.c
    62         ${AM_V_CC}gcc -DHAVE_CONFIG_H -I. -I../.. -D__CFA_DEBUG__ -O0 ${EXTRA_FLAGS} -c -o $@ $<
    6358
    64 exception.o : exception.c
    65         ${AM_V_CC}gcc -DHAVE_CONFIG_H -I. -I../.. -D__CFA_DEBUG__ -O0 ${EXTRA_FLAGS} -c -o $@ $<
    66 
    67 virtual.o : virtual.c
    68         ${AM_V_CC}gcc -DHAVE_CONFIG_H -I. -I../.. -D__CFA_DEBUG__ -O0 ${EXTRA_FLAGS} -c -o $@ $<
    69 
    70 ${libobjs} : @CFACPP@ ${cfalib_DATA} # add dependency to cfa-cpp so all libraries are rebuilt with new translator
     59${libobjs} : ${cfalib_DATA} # add dependency to cfa-cpp so all libraries are rebuilt with new translator
    7160
    7261libcfa_a_SOURCES = ${libsrc}
    73 libcfa_a_CFLAGS = -nodebug -O2
    7462
    7563stdhdr = ${shell find ${srcdir}/stdhdr -type f -printf "%p "}
     
    8977        concurrency/invoke.h
    9078
    91 CLEANFILES = libcfa-prelude.c
     79CLEANFILES = prelude.c
    9280
    9381maintainer-clean-local:
Note: See TracChangeset for help on using the changeset viewer.