Ignore:
Timestamp:
Jul 31, 2018, 2:43:04 PM (7 years ago)
Author:
Rob Schluntz <rschlunt@…>
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:
642bc83
Parents:
d1e0979 (diff), 04e367c (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 demangler

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/tests/preempt_longrun/Makefile.in

    rd1e0979 r3bbd012  
    337337AWK = @AWK@
    338338BACKEND_CC = @BACKEND_CC@
    339 CC = @CFA_BINDIR@/@CFA_NAME@
     339CC = ${top_builddir}/src/driver/cfa
    340340CCAS = @CCAS@
    341341CCASDEPMODE = @CCASDEPMODE@
     
    377377LTLIBOBJS = @LTLIBOBJS@
    378378MACHINE_TYPE = @MACHINE_TYPE@
    379 MAINT = @MAINT@
    380379MAKEINFO = @MAKEINFO@
    381380MKDIR_P = @MKDIR_P@
     
    466465.SUFFIXES:
    467466.SUFFIXES: .log .test .test$(EXEEXT) .trs
    468 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
     467$(srcdir)/Makefile.in: $(srcdir)/Makefile.am  $(am__configure_deps)
    469468        @for dep in $?; do \
    470469          case '$(am__configure_deps)' in \
     
    490489        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    491490
    492 $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
     491$(top_srcdir)/configure: $(am__configure_deps)
    493492        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    494 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
     493$(ACLOCAL_M4): $(am__aclocal_m4_deps)
    495494        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    496495$(am__aclocal_m4_deps):
Note: See TracChangeset for help on using the changeset viewer.