Changeset 0e76cf4f


Ignore:
Timestamp:
Nov 25, 2016, 2:52:45 PM (5 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, new-env, no_list, persistent-indexer, resolv-new, with_gc
Children:
f773f67
Parents:
c15b805
Message:

Updated the makefile for concurrency

Location:
src
Files:
2 added
1 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • src/driver/cfa.cc

    rc15b805 r0e76cf4f  
    244244                nargs += 1;
    245245        } // if
     246        args[nargs] = "-I" CFA_INCDIR "/concurrency";
     247        nargs += 1;
    246248        args[nargs] = "-I" CFA_INCDIR "/containers";
    247249        nargs += 1;
  • src/examples/coroutine.c

    rc15b805 r0e76cf4f  
    11#include <fstream>
    2 #include "../libcfa/kernel/kernel.h"
     2#include <threads>
    33
    44struct Fibonacci {
  • src/libcfa/Makefile.am

    rc15b805 r0e76cf4f  
    5656CC = ${abs_top_srcdir}/src/driver/cfa
    5757
    58 headers = limits stdlib math iostream fstream iterator rational containers/vector
     58headers = limits stdlib math iostream fstream iterator rational containers/vector concurrency/threads
     59runtimehdrs = concurrency
    5960libobjs = ${headers:=.o}
    6061
  • src/libcfa/Makefile.in

    rc15b805 r0e76cf4f  
    9292am__objects_1 = limits.$(OBJEXT) stdlib.$(OBJEXT) math.$(OBJEXT) \
    9393        iostream.$(OBJEXT) fstream.$(OBJEXT) iterator.$(OBJEXT) \
    94         rational.$(OBJEXT) containers/vector.$(OBJEXT)
     94        rational.$(OBJEXT) containers/vector.$(OBJEXT) \
     95        concurrency/threads.$(OBJEXT)
    9596am_libcfa_a_OBJECTS = libcfa-prelude.$(OBJEXT) $(am__objects_1)
    9697libcfa_a_OBJECTS = $(am_libcfa_a_OBJECTS)
     
    234235cfalib_DATA = builtins.cf extras.cf prelude.cf
    235236MAINTAINERCLEANFILES = builtins.cf extras.cf ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
    236 headers = limits stdlib math iostream fstream iterator rational containers/vector
     237headers = limits stdlib math iostream fstream iterator rational containers/vector concurrency/threads
     238runtimehdrs = concurrency
    237239libobjs = ${headers:=.o}
    238240libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c}
     
    312314containers/vector.$(OBJEXT): containers/$(am__dirstamp) \
    313315        containers/$(DEPDIR)/$(am__dirstamp)
     316concurrency/$(am__dirstamp):
     317        @$(MKDIR_P) concurrency
     318        @: > concurrency/$(am__dirstamp)
     319concurrency/$(DEPDIR)/$(am__dirstamp):
     320        @$(MKDIR_P) concurrency/$(DEPDIR)
     321        @: > concurrency/$(DEPDIR)/$(am__dirstamp)
     322concurrency/threads.$(OBJEXT): concurrency/$(am__dirstamp) \
     323        concurrency/$(DEPDIR)/$(am__dirstamp)
    314324libcfa.a: $(libcfa_a_OBJECTS) $(libcfa_a_DEPENDENCIES) $(EXTRA_libcfa_a_DEPENDENCIES)
    315325        $(AM_V_at)-rm -f libcfa.a
     
    319329mostlyclean-compile:
    320330        -rm -f *.$(OBJEXT)
     331        -rm -f concurrency/threads.$(OBJEXT)
    321332        -rm -f containers/vector.$(OBJEXT)
    322333
     
    332343@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rational.Po@am__quote@
    333344@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stdlib.Po@am__quote@
     345@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/threads.Po@am__quote@
    334346@AMDEP_TRUE@@am__include@ @am__quote@containers/$(DEPDIR)/vector.Po@am__quote@
    335347
     
    505517        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
    506518        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
     519        -rm -f concurrency/$(DEPDIR)/$(am__dirstamp)
     520        -rm -f concurrency/$(am__dirstamp)
    507521        -rm -f containers/$(DEPDIR)/$(am__dirstamp)
    508522        -rm -f containers/$(am__dirstamp)
     
    517531
    518532distclean: distclean-am
    519         -rm -rf ./$(DEPDIR) containers/$(DEPDIR)
     533        -rm -rf ./$(DEPDIR) concurrency/$(DEPDIR) containers/$(DEPDIR)
    520534        -rm -f Makefile
    521535distclean-am: clean-am distclean-compile distclean-generic \
     
    563577
    564578maintainer-clean: maintainer-clean-am
    565         -rm -rf ./$(DEPDIR) containers/$(DEPDIR)
     579        -rm -rf ./$(DEPDIR) concurrency/$(DEPDIR) containers/$(DEPDIR)
    566580        -rm -f Makefile
    567581maintainer-clean-am: distclean-am maintainer-clean-generic \
Note: See TracChangeset for help on using the changeset viewer.