Ignore:
Timestamp:
Jul 30, 2018, 4:49:40 PM (6 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:
3537dd7, 3bbd012
Parents:
ba4a1d8 (diff), a4248de1 (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:/u/cforall/software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/driver/Makefile.in

    rba4a1d8 r04e367c  
    221221LTLIBOBJS = @LTLIBOBJS@
    222222MACHINE_TYPE = @MACHINE_TYPE@
    223 MAINT = @MAINT@
    224223MAKEINFO = @MAKEINFO@
    225224MKDIR_P = @MKDIR_P@
     
    306305.SUFFIXES:
    307306.SUFFIXES: .cc .o .obj
    308 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
     307$(srcdir)/Makefile.in: $(srcdir)/Makefile.am  $(am__configure_deps)
    309308        @for dep in $?; do \
    310309          case '$(am__configure_deps)' in \
     
    330329        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    331330
    332 $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
     331$(top_srcdir)/configure: $(am__configure_deps)
    333332        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    334 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
     333$(ACLOCAL_M4): $(am__aclocal_m4_deps)
    335334        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    336335$(am__aclocal_m4_deps):
Note: See TracChangeset for help on using the changeset viewer.