Ignore:
Timestamp:
Aug 27, 2018, 4:40:34 PM (8 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct
Children:
b7c89aa
Parents:
f9feab8 (diff), 305581d (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 cleanup-dtors

File:
1 edited

Legend:

Unmodified
Added
Removed
  • tools/prettyprinter/Makefile.in

    rf9feab8 r90152a4  
    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)
     
    147148am__v_CXXLD_0 = @echo "  CXXLD   " $@;
    148149am__v_CXXLD_1 =
    149 @MAINTAINER_MODE_FALSE@am__skiplex = test -f $@ ||
    150150LEXCOMPILE = $(LEX) $(AM_LFLAGS) $(LFLAGS)
    151151AM_V_LEX = $(am__v_LEX_@AM_V@)
     
    154154am__v_LEX_1 =
    155155YLWRAP = $(top_srcdir)/automake/ylwrap
    156 @MAINTAINER_MODE_FALSE@am__skipyacc = test -f $@ ||
    157156am__yacc_c2h = sed -e s/cc$$/hh/ -e s/cpp$$/hpp/ -e s/cxx$$/hxx/ \
    158157                   -e s/c++$$/h++/ -e s/c$$/h/
     
    212211AWK = @AWK@
    213212BACKEND_CC = @BACKEND_CC@
     213BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    214214CC = @CC@
    215215CCAS = @CCAS@
     
    217217CCASFLAGS = @CCASFLAGS@
    218218CCDEPMODE = @CCDEPMODE@
     219CFACC = @CFACC@
     220CFACPP = @CFACPP@
    219221CFA_BACKEND_CC = @CFA_BACKEND_CC@
    220222CFA_BINDIR = @CFA_BINDIR@
     
    233235DEFS = @DEFS@
    234236DEPDIR = @DEPDIR@
     237DRIVER_DIR = @DRIVER_DIR@
    235238ECHO_C = @ECHO_C@
    236239ECHO_N = @ECHO_N@
     
    239242EXEEXT = @EXEEXT@
    240243GREP = @GREP@
     244HOST_FLAGS = @HOST_FLAGS@
    241245INSTALL = @INSTALL@
    242246INSTALL_DATA = @INSTALL_DATA@
     
    248252LEXLIB = @LEXLIB@
    249253LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
     254LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
     255LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
    250256LIBOBJS = @LIBOBJS@
    251257LIBS = @LIBS@
    252258LTLIBOBJS = @LTLIBOBJS@
    253 MACHINE_TYPE = @MACHINE_TYPE@
    254 MAINT = @MAINT@
    255259MAKEINFO = @MAKEINFO@
    256260MKDIR_P = @MKDIR_P@
     
    268272SHELL = @SHELL@
    269273STRIP = @STRIP@
     274TARGET_HOSTS = @TARGET_HOSTS@
    270275VERSION = @VERSION@
    271276YACC = @YACC@
     
    323328top_builddir = @top_builddir@
    324329top_srcdir = @top_srcdir@
     330AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
    325331BUILT_SOURCES = parser.hh
    326332AM_YFLAGS = -d -t -v
     
    341347.SUFFIXES:
    342348.SUFFIXES: .cc .ll .o .obj .yy
    343 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
     349$(srcdir)/Makefile.in: $(srcdir)/Makefile.am  $(am__configure_deps)
    344350        @for dep in $?; do \
    345351          case '$(am__configure_deps)' in \
     
    365371        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    366372
    367 $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
     373$(top_srcdir)/configure: $(am__configure_deps)
    368374        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    369 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
     375$(ACLOCAL_M4): $(am__aclocal_m4_deps)
    370376        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    371377$(am__aclocal_m4_deps):
Note: See TracChangeset for help on using the changeset viewer.