Changeset a9fb796


Ignore:
Timestamp:
Sep 18, 2018, 4:23:45 PM (3 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer
Children:
56b53b2
Parents:
0982a05
Message:

Fixed libcfa dependencies

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • benchmark/Makefile.in

    r0982a05 ra9fb796  
    465465
    466466
    467 .cfa.o: $(CFACC) $(CFACPP)
     467.cfa.o:
    468468        $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
    469469        $(CFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
  • libcfa/prelude/Makefile.am

    r0982a05 ra9fb796  
    2121cfalibdir = ${CFA_LIBDIR}
    2222cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cf bootloader.c
    23 noinst_DATA = ../src/prelude.c
    2423
    2524CC = @CFACC@
     
    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 
    6561bootloader.c : ${srcdir}/bootloader.cf prelude.cf 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
  • libcfa/prelude/Makefile.in

    r0982a05 ra9fb796  
    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
     
    264264cfalibdir = ${CFA_LIBDIR}
    265265cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cf bootloader.c
    266 noinst_DATA = ../src/prelude.c
    267266AM_CFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
    268267AM_CFAFLAGS = @CONFIG_CFAFLAGS@
     
    515514include $(DEPDIR)/builtins.Po
    516515
    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 
    520516bootloader.c : ${srcdir}/bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf @CFACPP@
    521517        ${AM_V_GEN}@CFACPP@ --prelude-dir=${builddir} -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
  • libcfa/src/Makefile.am

    r0982a05 ra9fb796  
    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@
     
    4042headers += concurrency/coroutine.hfa concurrency/thread.hfa concurrency/kernel.hfa concurrency/monitor.hfa concurrency/mutex.hfa
    4143
    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}
     44libsrc = startup.cfa interpose.cfa bits/debug.cfa assert.cfa exception.c virtual.c heap.cfa ${headers:.hfa=.cfa}
    4545
    4646# not all platforms support concurrency, add option do disable it
     
    4949#----------------------------------------------------------------------------------------------------------------
    5050# add dependency to cfa-cpp so all libraries are rebuilt with new translator
    51 ${libobjs} : ${cfalib_DATA}
     51#@CFACC@ @CFACPP@ prelude.cf
    5252
    53 libcfa_a_SOURCES = ${libsrc}
     53# add dependency of cfa files
     54libobjs = $(addsuffix .o, $(basename $(filter %.cfa,$(libsrc))))
     55$(libobjs) : @CFACC@ @CFACPP@ prelude.cf
     56
     57
     58# .deps inclusion is not done automatically by automake for new languages
     59libdeps = $(join \
     60        $(addsuffix $(DEPDIR)/ , $(dir $(libobjs) ) ), \
     61        $(notdir ${libobjs:.o=.Po}) \
     62)
     63
     64-include $(libdeps)
     65
     66prelude.o : prelude.cf extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
     67        ${AM_V_GEN}@CFACC@ ${AM_CFLAGS} ${CFLAGS} -in-tree -XCFA -l ${<} -c -o ${@}
     68
     69
     70
     71#----------------------------------------------------------------------------------------------------------------
     72libcfa_a_SOURCES = prelude.o ${libsrc}
    5473
    5574stdhdr = ${shell find ${srcdir}/stdhdr -type f -printf "%p "}
     
    6988        concurrency/invoke.h
    7089
    71 MOSTLYCLEANFILES = prelude.c
    72 
    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

    r0982a05 ra9fb796  
    1919
    2020
    21 VPATH = @srcdir@
    2221am__is_gnu_make = { \
    2322  if test -z '$(MAKELEVEL)'; then \
     
    147146        concurrency/kernel.$(OBJEXT) concurrency/monitor.$(OBJEXT) \
    148147        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) \
     148am__objects_2 = startup.$(OBJEXT) interpose.$(OBJEXT) \
     149        bits/debug.$(OBJEXT) assert.$(OBJEXT) exception.$(OBJEXT) \
     150        virtual.$(OBJEXT) heap.$(OBJEXT) $(am__objects_1) \
    153151        concurrency/CtxSwitch-@ARCHITECTURE@.$(OBJEXT) \
    154152        concurrency/alarm.$(OBJEXT) concurrency/invoke.$(OBJEXT) \
     
    220218        $(top_srcdir)/./automake/depcomp
    221219DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
     220VPATH = @srcdir@ :../prelude
    222221ACLOCAL = @ACLOCAL@
    223222AMTAR = @AMTAR@
     
    328327
    329328# create object files in directory with source files
    330 AUTOMAKE_OPTIONS = subdir-objects
     329AUTOMAKE_OPTIONS = foreign subdir-objects
    331330ARFLAGS = cr
    332331CFACOMPILE = $(CFACC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) $(AM_CFLAGS) $(CFLAGS)
     
    341340# use -no-include-stdhdr to prevent rebuild cycles
    342341# The built sources must not depend on the installed headers
    343 AM_CFAFLAGS = -quiet -in-tree -imacros prelude.c -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
     342AM_CFAFLAGS = -quiet -in-tree -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
    344343AM_CFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
    345344AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
     
    354353        concurrency/thread.hfa concurrency/kernel.hfa \
    355354        concurrency/monitor.hfa concurrency/mutex.hfa
    356 libobjs = ${headers:.hfa=.o}
    357355
    358356# not all platforms support concurrency, add option do disable it
    359 libsrc = prelude.c startup.cfa interpose.cfa bits/debug.cfa assert.cfa \
     357libsrc = startup.cfa interpose.cfa bits/debug.cfa assert.cfa \
    360358        exception.c virtual.c heap.cfa ${headers:.hfa=.cfa} \
    361359        concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa \
    362360        concurrency/invoke.c concurrency/preemption.cfa
    363 libcfa_a_SOURCES = ${libsrc}
     361
     362#----------------------------------------------------------------------------------------------------------------
     363# add dependency to cfa-cpp so all libraries are rebuilt with new translator
     364#@CFACC@ @CFACPP@ prelude.cf
     365
     366# add dependency of cfa files
     367libobjs = $(addsuffix .o, $(basename $(filter %.cfa,$(libsrc))))
     368
     369# .deps inclusion is not done automatically by automake for new languages
     370libdeps = $(join \
     371        $(addsuffix $(DEPDIR)/ , $(dir $(libobjs) ) ), \
     372        $(notdir ${libobjs:.o=.Po}) \
     373)
     374
     375
     376#----------------------------------------------------------------------------------------------------------------
     377libcfa_a_SOURCES = prelude.o ${libsrc}
    364378stdhdr = ${shell find ${srcdir}/stdhdr -type f -printf "%p "}
    365379cfa_includedir = $(CFA_INCDIR)
     
    377391        concurrency/invoke.h
    378392
    379 MOSTLYCLEANFILES = prelude.c
    380393all: all-am
    381394
     
    506519
    507520@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exception.Po@am__quote@
    508 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prelude.Po@am__quote@
    509521@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/virtual.Po@am__quote@
    510522@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/CtxSwitch-@ARCHITECTURE@.Po@am__quote@
     
    676688        fi
    677689mostlyclean-generic:
    678         -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
    679690
    680691clean-generic:
     
    784795
    785796
    786 .cfa.o: $(CFACC) $(CFACPP)
     797.cfa.o:
    787798        $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
    788799        $(CFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
    789800        $(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}
     801$(libobjs) : @CFACC@ @CFACPP@ prelude.cf
     802
     803-include $(libdeps)
     804
     805prelude.o : prelude.cf extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
     806        ${AM_V_GEN}@CFACC@ ${AM_CFLAGS} ${CFLAGS} -in-tree -XCFA -l ${<} -c -o ${@}
    794807
    795808#----------------------------------------------------------------------------------------------------------------
     
    797810        -rm -rf ${CFA_INCDIR} ${CFA_LIBDIR}
    798811
     812# $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
     813#       $(CFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     814#       $(am__mv) $$depbase.Tpo $$depbase.Po
     815
    799816# Tell versions [3.59,3.63) of GNU make to not export all variables.
    800817# Otherwise a system limit (for SysV at least) may be exceeded.
  • src/cfa.make

    r0982a05 ra9fb796  
    66am__v_CFA_1 =
    77
    8 .cfa.o: $(CFACC) $(CFACPP)
     8.cfa.o:
    99        $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
    1010        $(CFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
Note: See TracChangeset for help on using the changeset viewer.