Ignore:
Timestamp:
Jul 27, 2018, 1:35:35 PM (6 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:
8f50da0, c2ea058
Parents:
303c61d (diff), a92bd63 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/benchmark/Makefile.in

    r303c61d rea57077  
    177177LTLIBOBJS = @LTLIBOBJS@
    178178MACHINE_TYPE = @MACHINE_TYPE@
    179 MAINT = @MAINT@
    180179MAKEINFO = @MAKEINFO@
    181180MKDIR_P = @MKDIR_P@
     
    259258
    260259.SUFFIXES:
    261 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
     260$(srcdir)/Makefile.in: $(srcdir)/Makefile.am  $(am__configure_deps)
    262261        @for dep in $?; do \
    263262          case '$(am__configure_deps)' in \
     
    283282        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    284283
    285 $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
     284$(top_srcdir)/configure: $(am__configure_deps)
    286285        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    287 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
     286$(ACLOCAL_M4): $(am__aclocal_m4_deps)
    288287        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    289288$(am__aclocal_m4_deps):
Note: See TracChangeset for help on using the changeset viewer.