Changeset e9546f9


Ignore:
Timestamp:
Jul 22, 2018, 2:37:05 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:
46782ab
Parents:
982b0a5
Message:

Out of source tree build seem to work, except for tests

Location:
src
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • src/Makefile.am

    r982b0a5 re9546f9  
    4444driver_cfa_cpp_SOURCES = ${SRC}
    4545driver_cfa_cpp_LDADD = -ldl                     # yywrap
    46 driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I${abs_top_srcdir}/src/include -DYY_NO_INPUT -O2 -g -std=c++14
     46driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I${abs_top_srcdir}/src/Parser -I${abs_top_srcdir}/src/include -DYY_NO_INPUT -O2 -g -std=c++14
    4747driver_cfa_cpp_LDFLAGS = -Xlinker -export-dynamic
    4848
  • src/Makefile.in

    r982b0a5 re9546f9  
    327327    *) (install-info --version) >/dev/null 2>&1;; \
    328328  esac
    329 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
     329am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
     330        $(LISP)config.h.in
    330331# Read a list of newline-separated strings from the standard input,
    331332# and print each of them once, without duplicates.  Input order is
     
    541542driver_cfa_cpp_SOURCES = ${SRC}
    542543driver_cfa_cpp_LDADD = -ldl                     # yywrap
    543 driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I${abs_top_srcdir}/src/include -DYY_NO_INPUT -O2 -g -std=c++14
     544driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I${abs_top_srcdir}/src/Parser -I${abs_top_srcdir}/src/include -DYY_NO_INPUT -O2 -g -std=c++14
    544545driver_cfa_cpp_LDFLAGS = -Xlinker -export-dynamic
    545546all: $(BUILT_SOURCES)
  • src/driver/Makefile.am

    r982b0a5 re9546f9  
    2828endif
    2929
     30# don't install cfa directly
    3031noinst_PROGRAMS = cfa
    31 cfa_SOURCES = cfa.cc
    3232
     33# use
    3334install-exec-hook:
    3435        @test -z "$(CFA_BINDIR)" || $(MKDIR_P) "$(CFA_BINDIR)"
     
    4041        cd "$(CFA_BINDIR)" && rm -f $(CFA_NAME)
    4142
     43cfa_SOURCES = cfa.cc
     44
    4245# put into lib for now
    4346cc1libdir = ${CFA_LIBDIR}
  • src/driver/Makefile.in

    r982b0a5 re9546f9  
    626626
    627627
     628# use
    628629install-exec-hook:
    629630        @test -z "$(CFA_BINDIR)" || $(MKDIR_P) "$(CFA_BINDIR)"
  • src/libcfa/Makefile.am

    r982b0a5 re9546f9  
    3636         ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -D__CFA_DEBUG__ -Wall -O0 -c -o $@ $<
    3737
    38 EXTRA_FLAGS = -g -Wall -Wno-unused-function -imacros libcfa-prelude.c @CFA_FLAGS@
     38EXTRA_FLAGS = -g -Wall -Wno-unused-function -imacros libcfa-prelude.c -I${srcdir} @CFA_FLAGS@
    3939
    4040AM_CCASFLAGS = @CFA_FLAGS@
     
    4343#use -no-include-stdhdr to prevent rebuild cycles
    4444#The built sources must not depend on the installed headers
    45 CFLAGS = -quiet -no-include-stdhdr -I${abs_top_srcdir}/src/libcfa/stdhdr -XCFA -t -B${abs_top_srcdir}/src/driver ${EXTRA_FLAGS}
    46 CC = ${abs_top_srcdir}/src/driver/cfa
     45CFLAGS = -quiet -no-include-stdhdr -I${abs_top_srcdir}/src/libcfa/stdhdr -XCFA -t -B${abs_top_builddir}/src/driver ${EXTRA_FLAGS}
     46CC = ${abs_top_builddir}/src/driver/cfa
    4747
    4848headers = fstream iostream iterator limits rational time stdlib common \
     
    9292libcfa_d_a_CFLAGS = -debug -O0 #No need for __CFA_DEBUG__ since we pass -debug
    9393
    94 stdhdr = ${shell find stdhdr -type f -printf "%p "}
     94stdhdr = ${shell find ${srcdir}/stdhdr -type f -printf "%p "}
    9595
    9696cfa_includedir = $(CFA_INCDIR)
  • src/libcfa/Makefile.in

    r982b0a5 re9546f9  
    268268        containers/result containers/vector concurrency/coroutine \
    269269        concurrency/thread concurrency/kernel concurrency/monitor \
    270         concurrency/mutex ${shell find stdhdr -type f -printf "%p "} \
    271         math gmp time_t.h bits/align.h bits/containers.h bits/defs.h \
    272         bits/debug.h bits/locks.h concurrency/invoke.h
     270        concurrency/mutex ${shell find ${srcdir}/stdhdr -type f \
     271        -printf "%p "} math gmp time_t.h bits/align.h \
     272        bits/containers.h bits/defs.h bits/debug.h bits/locks.h \
     273        concurrency/invoke.h
    273274HEADERS = $(nobase_cfa_include_HEADERS)
    274275am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
     
    302303AWK = @AWK@
    303304BACKEND_CC = @BACKEND_CC@
    304 CC = ${abs_top_srcdir}/src/driver/cfa
     305CC = ${abs_top_builddir}/src/driver/cfa
    305306CCAS = @CCAS@
    306307CCASDEPMODE = @CCASDEPMODE@
     
    318319#use -no-include-stdhdr to prevent rebuild cycles
    319320#The built sources must not depend on the installed headers
    320 CFLAGS = -quiet -no-include-stdhdr -I${abs_top_srcdir}/src/libcfa/stdhdr -XCFA -t -B${abs_top_srcdir}/src/driver ${EXTRA_FLAGS}
     321CFLAGS = -quiet -no-include-stdhdr -I${abs_top_srcdir}/src/libcfa/stdhdr -XCFA -t -B${abs_top_builddir}/src/driver ${EXTRA_FLAGS}
    321322CPP = @CPP@
    322323CPPFLAGS = @CPPFLAGS@
     
    422423ARFLAGS = cr
    423424lib_LIBRARIES = $(am__append_1) $(am__append_2)
    424 EXTRA_FLAGS = -g -Wall -Wno-unused-function -imacros libcfa-prelude.c @CFA_FLAGS@
     425EXTRA_FLAGS = -g -Wall -Wno-unused-function -imacros libcfa-prelude.c -I${srcdir} @CFA_FLAGS@
    425426AM_CCASFLAGS = @CFA_FLAGS@
    426427headers = fstream iostream iterator limits rational time stdlib common \
     
    434435libcfa_d_a_SOURCES = ${libsrc}
    435436libcfa_d_a_CFLAGS = -debug -O0 #No need for __CFA_DEBUG__ since we pass -debug
    436 stdhdr = ${shell find stdhdr -type f -printf "%p "}
     437stdhdr = ${shell find ${srcdir}/stdhdr -type f -printf "%p "}
    437438cfa_includedir = $(CFA_INCDIR)
    438439nobase_cfa_include_HEADERS = \
  • src/prelude/Makefile.am

    r982b0a5 re9546f9  
    2323noinst_DATA = ../libcfa/libcfa-prelude.c
    2424
    25 CC = ${abs_top_srcdir}/src/driver/cfa
     25CC = ${abs_top_builddir}/src/driver/cfa
    2626
    2727$(DEPDIR) :
     
    3232
    3333# create extra forward types/declarations to reduce inclusion of library files
    34 extras.cf : extras.regx extras.c
    35         ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -E ${srcdir}/extras.c | grep -f extras.regx > ${srcdir}/extras.cf
     34extras.cf : ${srcdir}/extras.regx ${srcdir}/extras.c
     35        ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -E ${srcdir}/extras.c | grep -f ${srcdir}/extras.regx > extras.cf
    3636
    3737# create forward declarations for gcc builtins
    38 gcc-builtins.cf : gcc-builtins.c prototypes.sed
    39         ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -E -P $< | sed -r -f prototypes.sed > $@
     38gcc-builtins.cf : gcc-builtins.c ${srcdir}/prototypes.sed
     39        ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -I${srcdir} -E -P $< | sed -r -f ${srcdir}/prototypes.sed > $@
    4040
    41 gcc-builtins.c : builtins.def prototypes.awk sync-builtins.cf
    42         ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -E prototypes.c | awk -f prototypes.awk > $@
     41gcc-builtins.c : ${srcdir}/builtins.def ${srcdir}/prototypes.awk ${srcdir}/sync-builtins.cf ${srcdir}/prototypes.c
     42        ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -I${srcdir} -E ${srcdir}/prototypes.c | awk -f ${srcdir}/prototypes.awk > $@
    4343
    4444prelude.cf : prelude-gen.cc
     
    5858include $(DEPDIR)/builtins.Po
    5959
    60 ../libcfa/libcfa-prelude.c : prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp
    61         ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -l prelude.cf $@  # use src/cfa-cpp as not in lib until after install
     60../libcfa/libcfa-prelude.c : prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_builddir}/src/driver/cfa-cpp
     61        ${AM_V_GEN}${abs_top_builddir}/src/driver/cfa-cpp -l prelude.cf $@  # use src/cfa-cpp as not in lib until after install
    6262
    63 bootloader.c : bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp
    64         ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -tpm bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
     63bootloader.c : ${srcdir}/bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_builddir}/src/driver/cfa-cpp
     64        ${AM_V_GEN}${abs_top_builddir}/src/driver/cfa-cpp -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
    6565
    6666maintainer-clean-local :
  • src/prelude/Makefile.in

    r982b0a5 re9546f9  
    162162AWK = @AWK@
    163163BACKEND_CC = @BACKEND_CC@
    164 CC = ${abs_top_srcdir}/src/driver/cfa
     164CC = ${abs_top_builddir}/src/driver/cfa
    165165CCAS = @CCAS@
    166166CCASDEPMODE = @CCASDEPMODE@
     
    501501
    502502# create extra forward types/declarations to reduce inclusion of library files
    503 extras.cf : extras.regx extras.c
    504         ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -E ${srcdir}/extras.c | grep -f extras.regx > ${srcdir}/extras.cf
     503extras.cf : ${srcdir}/extras.regx ${srcdir}/extras.c
     504        ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -E ${srcdir}/extras.c | grep -f ${srcdir}/extras.regx > extras.cf
    505505
    506506# create forward declarations for gcc builtins
    507 gcc-builtins.cf : gcc-builtins.c prototypes.sed
    508         ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -E -P $< | sed -r -f prototypes.sed > $@
    509 
    510 gcc-builtins.c : builtins.def prototypes.awk sync-builtins.cf
    511         ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -E prototypes.c | awk -f prototypes.awk > $@
     507gcc-builtins.cf : gcc-builtins.c ${srcdir}/prototypes.sed
     508        ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -I${srcdir} -E -P $< | sed -r -f ${srcdir}/prototypes.sed > $@
     509
     510gcc-builtins.c : ${srcdir}/builtins.def ${srcdir}/prototypes.awk ${srcdir}/sync-builtins.cf ${srcdir}/prototypes.c
     511        ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -I${srcdir} -E ${srcdir}/prototypes.c | awk -f ${srcdir}/prototypes.awk > $@
    512512
    513513prelude.cf : prelude-gen.cc
     
    527527include $(DEPDIR)/builtins.Po
    528528
    529 ../libcfa/libcfa-prelude.c : prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp
    530         ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -l prelude.cf $@  # use src/cfa-cpp as not in lib until after install
    531 
    532 bootloader.c : bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp
    533         ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -tpm bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
     529../libcfa/libcfa-prelude.c : prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_builddir}/src/driver/cfa-cpp
     530        ${AM_V_GEN}${abs_top_builddir}/src/driver/cfa-cpp -l prelude.cf $@  # use src/cfa-cpp as not in lib until after install
     531
     532bootloader.c : ${srcdir}/bootloader.cf prelude.cf extras.cf gcc-builtins.cf builtins.cf ${abs_top_builddir}/src/driver/cfa-cpp
     533        ${AM_V_GEN}${abs_top_builddir}/src/driver/cfa-cpp -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
    534534
    535535maintainer-clean-local :
Note: See TracChangeset for help on using the changeset viewer.