Changeset 455a7d5 for tools


Ignore:
Timestamp:
Aug 9, 2018, 6:35:02 PM (7 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum
Children:
ea5b7d6
Parents:
fb975a50 (diff), 0c827019 (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' into jenkins-sandbox

Location:
tools
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • tools/Makefile.in

    rfb975a50 r455a7d5  
    9696subdir = tools
    9797ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    98 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
     98am__aclocal_m4_deps = $(top_srcdir)/automake/cfa.m4 \
     99        $(top_srcdir)/configure.ac
    99100am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    100101        $(ACLOCAL_M4)
    … …  
    186187AWK = @AWK@
    187188BACKEND_CC = @BACKEND_CC@
     189BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    188190CC = @BACKEND_CC@
    189191CCAS = @CCAS@
    … …  
    191193CCASFLAGS = @CCASFLAGS@
    192194CCDEPMODE = @CCDEPMODE@
     195CFACC = @CFACC@
     196CFACPP = @CFACPP@
    193197CFA_BACKEND_CC = @CFA_BACKEND_CC@
    194198CFA_BINDIR = @CFA_BINDIR@
    … …  
    207211DEFS = @DEFS@
    208212DEPDIR = @DEPDIR@
     213DRIVER_DIR = @DRIVER_DIR@
    209214ECHO_C = @ECHO_C@
    210215ECHO_N = @ECHO_N@
    … …  
    222227LEXLIB = @LEXLIB@
    223228LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
     229LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
     230LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
    224231LIBOBJS = @LIBOBJS@
    225232LIBS = @LIBS@
    226233LTLIBOBJS = @LTLIBOBJS@
    227 MACHINE_TYPE = @MACHINE_TYPE@
    228234MAKEINFO = @MAKEINFO@
    229235MKDIR_P = @MKDIR_P@
    … …  
    241247SHELL = @SHELL@
    242248STRIP = @STRIP@
     249TARGET_HOSTS = @TARGET_HOSTS@
    243250VERSION = @VERSION@
    244251YACC = @YACC@

  • tools/prettyprinter/Makefile.in

    rfb975a50 r455a7d5  
    9595subdir = tools/prettyprinter
    9696ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    97 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
     97am__aclocal_m4_deps = $(top_srcdir)/automake/cfa.m4 \
     98        $(top_srcdir)/configure.ac
    9899am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    99100        $(ACLOCAL_M4)
    … …  
    210211AWK = @AWK@
    211212BACKEND_CC = @BACKEND_CC@
     213BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    212214CC = @CC@
    213215CCAS = @CCAS@
    … …  
    215217CCASFLAGS = @CCASFLAGS@
    216218CCDEPMODE = @CCDEPMODE@
     219CFACC = @CFACC@
     220CFACPP = @CFACPP@
    217221CFA_BACKEND_CC = @CFA_BACKEND_CC@
    218222CFA_BINDIR = @CFA_BINDIR@
    … …  
    231235DEFS = @DEFS@
    232236DEPDIR = @DEPDIR@
     237DRIVER_DIR = @DRIVER_DIR@
    233238ECHO_C = @ECHO_C@
    234239ECHO_N = @ECHO_N@
    … …  
    246251LEXLIB = @LEXLIB@
    247252LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
     253LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
     254LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
    248255LIBOBJS = @LIBOBJS@
    249256LIBS = @LIBS@
    250257LTLIBOBJS = @LTLIBOBJS@
    251 MACHINE_TYPE = @MACHINE_TYPE@
    252258MAKEINFO = @MAKEINFO@
    253259MKDIR_P = @MKDIR_P@
    … …  
    265271SHELL = @SHELL@
    266272STRIP = @STRIP@
     273TARGET_HOSTS = @TARGET_HOSTS@
    267274VERSION = @VERSION@
    268275YACC = @YACC@
Note: See TracChangeset for help on using the changeset viewer.