Changeset 5e44ac2 for tools/Makefile.in


Ignore:
Timestamp:
Aug 15, 2018, 1:58:02 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:
90cac45
Parents:
d7d63e5 (diff), 7bd4cc9 (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

  • tools/Makefile.in

    rd7d63e5 r5e44ac2  
    9696subdir = tools
    9797ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    98 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
     98am__aclocal_m4_deps = $(top_srcdir)/automake/cfa.m4 \
     99        $(top_srcdir)/configure.ac
    99100am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    100101        $(ACLOCAL_M4)
    … …  
    187188BACKEND_CC = @BACKEND_CC@
    188189BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    189 BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
    190190CC = @BACKEND_CC@
    191191CCAS = @CCAS@
    … …  
    202202CFA_NAME = @CFA_NAME@
    203203CFA_PREFIX = @CFA_PREFIX@
    204 CFLAGS = -Wall -Wextra -O2 -g
     204CFLAGS = @CFLAGS@
    205205CPP = @CPP@
    206206CPPFLAGS = @CPPFLAGS@
    … …  
    218218EXEEXT = @EXEEXT@
    219219GREP = @GREP@
     220HOST_FLAGS = @HOST_FLAGS@
    220221INSTALL = @INSTALL@
    221222INSTALL_DATA = @INSTALL_DATA@
    … …  
    227228LEXLIB = @LEXLIB@
    228229LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
     230LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
     231LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
    229232LIBOBJS = @LIBOBJS@
    230233LIBS = @LIBS@
    231234LTLIBOBJS = @LTLIBOBJS@
    232 MACHINE_TYPE = @MACHINE_TYPE@
    233235MAKEINFO = @MAKEINFO@
    234236MKDIR_P = @MKDIR_P@
    … …  
    246248SHELL = @SHELL@
    247249STRIP = @STRIP@
     250TARGET_HOSTS = @TARGET_HOSTS@
    248251VERSION = @VERSION@
    249252YACC = @YACC@
    … …  
    301304top_builddir = @top_builddir@
    302305top_srcdir = @top_srcdir@
     306AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
     307AM_CFLAGS = -Wall -Wextra -O2 -g
    303308busy_SOURCES = busy.c
    304309busy_LDFLAGS = -pthread
Note: See TracChangeset for help on using the changeset viewer.