Ignore:
Timestamp:
Aug 14, 2018, 4:10:58 PM (7 years ago)
Author:
Peter A. Buhr <pabuhr@…>
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, stuck-waitfor-destruct
Children:
636e1b9
Parents:
c3a8ecd (diff), 5a5d31a (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 plg2:software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed

  • tools/prettyprinter/Makefile.in

    rc3a8ecd r7cd8827  
    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)
    … …  
    211212BACKEND_CC = @BACKEND_CC@
    212213BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    213 BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
    214214CC = @CC@
    215215CCAS = @CCAS@
    … …  
    242242EXEEXT = @EXEEXT@
    243243GREP = @GREP@
     244HOST_FLAGS = @HOST_FLAGS@
    244245INSTALL = @INSTALL@
    245246INSTALL_DATA = @INSTALL_DATA@
    … …  
    251252LEXLIB = @LEXLIB@
    252253LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
     254LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
     255LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
    253256LIBOBJS = @LIBOBJS@
    254257LIBS = @LIBS@
    255258LTLIBOBJS = @LTLIBOBJS@
    256 MACHINE_TYPE = @MACHINE_TYPE@
    257259MAKEINFO = @MAKEINFO@
    258260MKDIR_P = @MKDIR_P@
    … …  
    270272SHELL = @SHELL@
    271273STRIP = @STRIP@
     274TARGET_HOSTS = @TARGET_HOSTS@
    272275VERSION = @VERSION@
    273276YACC = @YACC@
    … …  
    325328top_builddir = @top_builddir@
    326329top_srcdir = @top_srcdir@
     330AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
    327331BUILT_SOURCES = parser.hh
    328332AM_YFLAGS = -d -t -v
Note: See TracChangeset for help on using the changeset viewer.