Changeset e99e43f for tools/Makefile.in


Ignore:
Timestamp:
Jan 10, 2019, 3:50:34 PM (7 years ago)
Author:
Aaron Moss <a3moss@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum
Children:
d97c3a4
Parents:
aeb8f70 (diff), 08222c7 (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.
git-author:
Aaron Moss <a3moss@…> (01/10/19 14:46:09)
git-committer:
Aaron Moss <a3moss@…> (01/10/19 15:50:34)
Message:

Merge remote-tracking branch 'plg/master' into deferred_resn

File:
1 edited

Legend:

Unmodified
Added
Removed

  • tools/Makefile.in

    raeb8f70 re99e43f  
    9696subdir = tools
    9797ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    98 am__aclocal_m4_deps = $(top_srcdir)/automake/cfa.m4 \
    99         $(top_srcdir)/configure.ac
     98am__aclocal_m4_deps = $(top_srcdir)/automake/libtool.m4 \
     99        $(top_srcdir)/automake/ltoptions.m4 \
     100        $(top_srcdir)/automake/ltsugar.m4 \
     101        $(top_srcdir)/automake/ltversion.m4 \
     102        $(top_srcdir)/automake/lt~obsolete.m4 \
     103        $(top_srcdir)/automake/cfa.m4 $(top_srcdir)/configure.ac
    100104am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    101105        $(ACLOCAL_M4)
    … …  
    109113busy_OBJECTS = $(am_busy_OBJECTS)
    110114busy_LDADD = $(LDADD)
    111 busy_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(busy_LDFLAGS) $(LDFLAGS) \
    112         -o $@
     115AM_V_lt = $(am__v_lt_@AM_V@)
     116am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
     117am__v_lt_0 = --silent
     118am__v_lt_1 =
     119busy_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
     120        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
     121        $(busy_LDFLAGS) $(LDFLAGS) -o $@
    113122am_catchsig_OBJECTS = catchsig.$(OBJEXT)
    114123catchsig_OBJECTS = $(am_catchsig_OBJECTS)
    … …  
    138147COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
    139148        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
     149LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
     150        $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
     151        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
     152        $(AM_CFLAGS) $(CFLAGS)
    140153AM_V_CC = $(am__v_CC_@AM_V@)
    141154am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
    … …  
    143156am__v_CC_1 =
    144157CCLD = $(CC)
    145 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
     158LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
     159        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
     160        $(AM_LDFLAGS) $(LDFLAGS) -o $@
    146161AM_V_CCLD = $(am__v_CCLD_@AM_V@)
    147162am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
    … …  
    182197AMTAR = @AMTAR@
    183198AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
     199AR = @AR@
    184200AUTOCONF = @AUTOCONF@
    185201AUTOHEADER = @AUTOHEADER@
    186202AUTOMAKE = @AUTOMAKE@
    187203AWK = @AWK@
    188 BACKEND_CC = @BACKEND_CC@
    189204BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    190 CC = @BACKEND_CC@
     205CC = @CC@
    191206CCAS = @CCAS@
    192207CCASDEPMODE = @CCASDEPMODE@
    … …  
    206221CPPFLAGS = @CPPFLAGS@
    207222CXX = @CXX@
     223CXXCPP = @CXXCPP@
    208224CXXDEPMODE = @CXXDEPMODE@
    209225CXXFLAGS = @CXXFLAGS@
    … …  
    211227DEFS = @DEFS@
    212228DEPDIR = @DEPDIR@
     229DLLTOOL = @DLLTOOL@
    213230DRIVER_DIR = @DRIVER_DIR@
     231DSYMUTIL = @DSYMUTIL@
     232DUMPBIN = @DUMPBIN@
    214233ECHO_C = @ECHO_C@
    215234ECHO_N = @ECHO_N@
    … …  
    217236EGREP = @EGREP@
    218237EXEEXT = @EXEEXT@
     238FGREP = @FGREP@
    219239GREP = @GREP@
    220240HOST_FLAGS = @HOST_FLAGS@
    … …  
    224244INSTALL_SCRIPT = @INSTALL_SCRIPT@
    225245INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
     246LD = @LD@
    226247LDFLAGS = @LDFLAGS@
    227248LEX = @LEX@
    … …  
    232253LIBOBJS = @LIBOBJS@
    233254LIBS = @LIBS@
     255LIBTOOL = @LIBTOOL@
     256LIPO = @LIPO@
     257LN_S = @LN_S@
    234258LTLIBOBJS = @LTLIBOBJS@
     259LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
    235260MAKEINFO = @MAKEINFO@
     261MANIFEST_TOOL = @MANIFEST_TOOL@
    236262MKDIR_P = @MKDIR_P@
     263NM = @NM@
     264NMEDIT = @NMEDIT@
     265OBJDUMP = @OBJDUMP@
    237266OBJEXT = @OBJEXT@
     267OTOOL = @OTOOL@
     268OTOOL64 = @OTOOL64@
    238269PACKAGE = @PACKAGE@
    239270PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
    … …  
    245276PATH_SEPARATOR = @PATH_SEPARATOR@
    246277RANLIB = @RANLIB@
     278SED = @SED@
    247279SET_MAKE = @SET_MAKE@
    248280SHELL = @SHELL@
    … …  
    256288abs_top_builddir = @abs_top_builddir@
    257289abs_top_srcdir = @abs_top_srcdir@
     290ac_ct_AR = @ac_ct_AR@
    258291ac_ct_CC = @ac_ct_CC@
    259292ac_ct_CXX = @ac_ct_CXX@
     293ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
    260294am__include = @am__include@
    261295am__leading_dot = @am__leading_dot@
    … …  
    305339top_srcdir = @top_srcdir@
    306340AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
     341ACLOCAL_AMFLAGS = -I automake
    307342AM_CFLAGS = -Wall -Wextra -O2 -g
    308343busy_SOURCES = busy.c
    … …  
    314349
    315350.SUFFIXES:
    316 .SUFFIXES: .c .o .obj
     351.SUFFIXES: .c .lo .o .obj
    317352$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
    318353        @for dep in $?; do \
    … …  
    346381
    347382clean-noinstPROGRAMS:
    348         -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
     383        @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
     384        echo " rm -f" $$list; \
     385        rm -f $$list || exit $$?; \
     386        test -n "$(EXEEXT)" || exit 0; \
     387        list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
     388        echo " rm -f" $$list; \
     389        rm -f $$list
    349390
    350391busy$(EXEEXT): $(busy_OBJECTS) $(busy_DEPENDENCIES) $(EXTRA_busy_DEPENDENCIES)
    … …  
    390431@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    391432@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
     433
     434.c.lo:
     435@am__fastdepCC_TRUE@    $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
     436@am__fastdepCC_TRUE@    $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     437@am__fastdepCC_TRUE@    $(am__mv) $$depbase.Tpo $$depbase.Plo
     438@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
     439@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     440@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
     441
     442mostlyclean-libtool:
     443        -rm -f *.lo
     444
     445clean-libtool:
     446        -rm -rf .libs _libs
    392447
    393448ID: $(am__tagged_files)
    … …  
    509564clean: clean-am
    510565
    511 clean-am: clean-generic clean-noinstPROGRAMS mostlyclean-am
     566clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
     567        mostlyclean-am
    512568
    513569distclean: distclean-am
    … …  
    564620mostlyclean: mostlyclean-am
    565621
    566 mostlyclean-am: mostlyclean-compile mostlyclean-generic
     622mostlyclean-am: mostlyclean-compile mostlyclean-generic \
     623        mostlyclean-libtool
    567624
    568625pdf: pdf-am
    … …  
    579636
    580637.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
    581         clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \
    582         distclean-compile distclean-generic distclean-tags distdir dvi \
    583         dvi-am html html-am info info-am install install-am \
    584         install-data install-data-am install-dvi install-dvi-am \
    585         install-exec install-exec-am install-html install-html-am \
    586         install-info install-info-am install-man install-pdf \
    587         install-pdf-am install-ps install-ps-am install-strip \
    588         installcheck installcheck-am installdirs maintainer-clean \
     638        clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \
     639        ctags-am distclean distclean-compile distclean-generic \
     640        distclean-libtool distclean-tags distdir dvi dvi-am html \
     641        html-am info info-am install install-am install-data \
     642        install-data-am install-dvi install-dvi-am install-exec \
     643        install-exec-am install-html install-html-am install-info \
     644        install-info-am install-man install-pdf install-pdf-am \
     645        install-ps install-ps-am install-strip installcheck \
     646        installcheck-am installdirs maintainer-clean \
    589647        maintainer-clean-generic mostlyclean mostlyclean-compile \
    590         mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
    591         uninstall-am
     648        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
     649        tags tags-am uninstall uninstall-am
    592650
    593651.PRECIOUS: Makefile
Note: See TracChangeset for help on using the changeset viewer.