Ignore:
Timestamp:
Oct 29, 2019, 4:01:24 PM (6 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
773db65, 9421f3d8
Parents:
7951100 (diff), 8364209 (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

  • tools/prettyprinter/Makefile.in

    r7951100 rb067d9b  
    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/libtool.m4 \
     98        $(top_srcdir)/automake/ltoptions.m4 \
     99        $(top_srcdir)/automake/ltsugar.m4 \
     100        $(top_srcdir)/automake/ltversion.m4 \
     101        $(top_srcdir)/automake/lt~obsolete.m4 \
     102        $(top_srcdir)/automake/cfa.m4 $(top_srcdir)/configure.ac
    98103am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    99104        $(ACLOCAL_M4)
    … …  
    112117am__DEPENDENCIES_1 =
    113118pretty_DEPENDENCIES = $(am__DEPENDENCIES_1)
    114 pretty_LINK = $(CXXLD) $(pretty_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
    115         $(LDFLAGS) -o $@
     119AM_V_lt = $(am__v_lt_@AM_V@)
     120am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
     121am__v_lt_0 = --silent
     122am__v_lt_1 =
     123pretty_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
     124        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pretty_CXXFLAGS) \
     125        $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
    116126AM_V_P = $(am__v_P_@AM_V@)
    117127am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
    … …  
    130140am__depfiles_maybe = depfiles
    131141am__mv = mv -f
    132 AM_V_lt = $(am__v_lt_@AM_V@)
    133 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
    134 am__v_lt_0 = --silent
    135 am__v_lt_1 =
    136142CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    137143        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
     144LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
     145        $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
     146        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
     147        $(AM_CXXFLAGS) $(CXXFLAGS)
    138148AM_V_CXX = $(am__v_CXX_@AM_V@)
    139149am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
    … …  
    141151am__v_CXX_1 =
    142152CXXLD = $(CXX)
    143 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
    144         -o $@
     153CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
     154        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
     155        $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
    145156AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
    146157am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
    147158am__v_CXXLD_0 = @echo "  CXXLD   " $@;
    148159am__v_CXXLD_1 =
    149 @MAINTAINER_MODE_FALSE@am__skiplex = test -f $@ ||
    150160LEXCOMPILE = $(LEX) $(AM_LFLAGS) $(LFLAGS)
     161LTLEXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
     162        $(LIBTOOLFLAGS) --mode=compile $(LEX) $(AM_LFLAGS) $(LFLAGS)
    151163AM_V_LEX = $(am__v_LEX_@AM_V@)
    152164am__v_LEX_ = $(am__v_LEX_@AM_DEFAULT_V@)
    … …  
    154166am__v_LEX_1 =
    155167YLWRAP = $(top_srcdir)/automake/ylwrap
    156 @MAINTAINER_MODE_FALSE@am__skipyacc = test -f $@ ||
    157168am__yacc_c2h = sed -e s/cc$$/hh/ -e s/cpp$$/hpp/ -e s/cxx$$/hxx/ \
    158169                   -e s/c++$$/h++/ -e s/c$$/h/
    159170YACCCOMPILE = $(YACC) $(AM_YFLAGS) $(YFLAGS)
     171LTYACCCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
     172        $(LIBTOOLFLAGS) --mode=compile $(YACC) $(AM_YFLAGS) $(YFLAGS)
    160173AM_V_YACC = $(am__v_YACC_@AM_V@)
    161174am__v_YACC_ = $(am__v_YACC_@AM_DEFAULT_V@)
    … …  
    164177COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
    165178        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
     179LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
     180        $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
     181        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
     182        $(AM_CFLAGS) $(CFLAGS)
    166183AM_V_CC = $(am__v_CC_@AM_V@)
    167184am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
    … …  
    169186am__v_CC_1 =
    170187CCLD = $(CC)
    171 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
     188LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
     189        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
     190        $(AM_LDFLAGS) $(LDFLAGS) -o $@
    172191AM_V_CCLD = $(am__v_CCLD_@AM_V@)
    173192am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
    … …  
    204223DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    205224ACLOCAL = @ACLOCAL@
    206 ALLOCA = @ALLOCA@
    207225AMTAR = @AMTAR@
    208226AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
     227AR = @AR@
    209228AUTOCONF = @AUTOCONF@
    210229AUTOHEADER = @AUTOHEADER@
    211230AUTOMAKE = @AUTOMAKE@
    212231AWK = @AWK@
    213 BACKEND_CC = @BACKEND_CC@
     232BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    214233CC = @CC@
    215234CCAS = @CCAS@
    … …  
    217236CCASFLAGS = @CCASFLAGS@
    218237CCDEPMODE = @CCDEPMODE@
     238CFACC = @CFACC@
     239CFACC_INSTALL = @CFACC_INSTALL@
     240CFACPP = @CFACPP@
    219241CFA_BACKEND_CC = @CFA_BACKEND_CC@
    220242CFA_BINDIR = @CFA_BINDIR@
    … …  
    228250CPPFLAGS = @CPPFLAGS@
    229251CXX = @CXX@
     252CXXCPP = @CXXCPP@
    230253CXXDEPMODE = @CXXDEPMODE@
    231254CXXFLAGS = @CXXFLAGS@
    232255CYGPATH_W = @CYGPATH_W@
    233256DEFS = @DEFS@
     257DEMANGLER = @DEMANGLER@
    234258DEPDIR = @DEPDIR@
     259DLLTOOL = @DLLTOOL@
     260DRIVER_DIR = @DRIVER_DIR@
     261DSYMUTIL = @DSYMUTIL@
     262DUMPBIN = @DUMPBIN@
    235263ECHO_C = @ECHO_C@
    236264ECHO_N = @ECHO_N@
    … …  
    238266EGREP = @EGREP@
    239267EXEEXT = @EXEEXT@
     268FGREP = @FGREP@
    240269GREP = @GREP@
     270HAS_DISTCC = @HAS_DISTCC@
     271HOST_FLAGS = @HOST_FLAGS@
    241272INSTALL = @INSTALL@
    242273INSTALL_DATA = @INSTALL_DATA@
    … …  
    244275INSTALL_SCRIPT = @INSTALL_SCRIPT@
    245276INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
     277LD = @LD@
    246278LDFLAGS = @LDFLAGS@
    247279LEX = @LEX@
    248280LEXLIB = @LEXLIB@
    249281LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
     282LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
     283LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
     284LIBDEMANGLE = @LIBDEMANGLE@
    250285LIBOBJS = @LIBOBJS@
    251286LIBS = @LIBS@
     287LIBTOOL = @LIBTOOL@
     288LIPO = @LIPO@
     289LN_S = @LN_S@
    252290LTLIBOBJS = @LTLIBOBJS@
    253 MACHINE_TYPE = @MACHINE_TYPE@
    254 MAINT = @MAINT@
     291LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
    255292MAKEINFO = @MAKEINFO@
     293MANIFEST_TOOL = @MANIFEST_TOOL@
    256294MKDIR_P = @MKDIR_P@
     295NM = @NM@
     296NMEDIT = @NMEDIT@
     297OBJDUMP = @OBJDUMP@
    257298OBJEXT = @OBJEXT@
     299OTOOL = @OTOOL@
     300OTOOL64 = @OTOOL64@
    258301PACKAGE = @PACKAGE@
    259302PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
    … …  
    265308PATH_SEPARATOR = @PATH_SEPARATOR@
    266309RANLIB = @RANLIB@
     310SED = @SED@
    267311SET_MAKE = @SET_MAKE@
    268312SHELL = @SHELL@
    269313STRIP = @STRIP@
     314TARGET_HOSTS = @TARGET_HOSTS@
    270315VERSION = @VERSION@
    271316YACC = @YACC@
    … …  
    275320abs_top_builddir = @abs_top_builddir@
    276321abs_top_srcdir = @abs_top_srcdir@
     322ac_ct_AR = @ac_ct_AR@
    277323ac_ct_CC = @ac_ct_CC@
    278324ac_ct_CXX = @ac_ct_CXX@
     325ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
    279326am__include = @am__include@
    280327am__leading_dot = @am__leading_dot@
    … …  
    323370top_builddir = @top_builddir@
    324371top_srcdir = @top_srcdir@
     372AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
     373ACLOCAL_AMFLAGS = -I automake
    325374BUILT_SOURCES = parser.hh
    326375AM_YFLAGS = -d -t -v
    … …  
    340389
    341390.SUFFIXES:
    342 .SUFFIXES: .cc .ll .o .obj .yy
    343 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
     391.SUFFIXES: .cc .ll .lo .o .obj .yy
     392$(srcdir)/Makefile.in: $(srcdir)/Makefile.am  $(am__configure_deps)
    344393        @for dep in $?; do \
    345394          case '$(am__configure_deps)' in \
    … …  
    365414        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    366415
    367 $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
     416$(top_srcdir)/configure: $(am__configure_deps)
    368417        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    369 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
     418$(ACLOCAL_M4): $(am__aclocal_m4_deps)
    370419        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    371420$(am__aclocal_m4_deps):
    … …  
    380429        sed 's/$(EXEEXT)$$//' | \
    381430        while read p p1; do if test -f $$p \
     431         || test -f $$p1 \
    382432          ; then echo "$$p"; echo "$$p"; else :; fi; \
    383433        done | \
    … …  
    394444            if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
    395445            test -z "$$files" || { \
    396               echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(tools_prettyprinterdir)$$dir'"; \
    397               $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(tools_prettyprinterdir)$$dir" || exit $$?; \
     446            echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(tools_prettyprinterdir)$$dir'"; \
     447            $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(tools_prettyprinterdir)$$dir" || exit $$?; \
    398448            } \
    399449        ; done
    … …  
    411461
    412462clean-tools_prettyprinterPROGRAMS:
    413         -test -z "$(tools_prettyprinter_PROGRAMS)" || rm -f $(tools_prettyprinter_PROGRAMS)
     463        @list='$(tools_prettyprinter_PROGRAMS)'; test -n "$$list" || exit 0; \
     464        echo " rm -f" $$list; \
     465        rm -f $$list || exit $$?; \
     466        test -n "$(EXEEXT)" || exit 0; \
     467        list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
     468        echo " rm -f" $$list; \
     469        rm -f $$list
    414470parser.hh: parser.cc
    415471        @if test ! -f $@; then rm -f parser.cc; else :; fi
    … …  
    448504@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    449505
     506.cc.lo:
     507@am__fastdepCXX_TRUE@   $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
     508@am__fastdepCXX_TRUE@   $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     509@am__fastdepCXX_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Plo
     510@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
     511@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     512@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
     513
    450514pretty-lex.o: lex.cc
    451515@am__fastdepCXX_TRUE@   $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pretty_CXXFLAGS) $(CXXFLAGS) -MT pretty-lex.o -MD -MP -MF $(DEPDIR)/pretty-lex.Tpo -c -o pretty-lex.o `test -f 'lex.cc' || echo '$(srcdir)/'`lex.cc
    … …  
    523587.yy.cc:
    524588        $(AM_V_YACC)$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h `echo $@ | $(am__yacc_c2h)` y.output $*.output -- $(YACCCOMPILE)
     589
     590mostlyclean-libtool:
     591        -rm -f *.lo
     592
     593clean-libtool:
     594        -rm -rf .libs _libs
    525595
    526596ID: $(am__tagged_files)
    … …  
    652722clean: clean-am
    653723
    654 clean-am: clean-generic clean-tools_prettyprinterPROGRAMS \
    655         mostlyclean-am
     724clean-am: clean-generic clean-libtool \
     725        clean-tools_prettyprinterPROGRAMS mostlyclean-am
    656726
    657727distclean: distclean-am
    … …  
    708778mostlyclean: mostlyclean-am
    709779
    710 mostlyclean-am: mostlyclean-compile mostlyclean-generic
     780mostlyclean-am: mostlyclean-compile mostlyclean-generic \
     781        mostlyclean-libtool
    711782
    712783pdf: pdf-am
    … …  
    723794
    724795.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
    725         clean-tools_prettyprinterPROGRAMS cscopelist-am ctags ctags-am \
    726         distclean distclean-compile distclean-generic distclean-tags \
    727         distdir dvi dvi-am html html-am info info-am install \
    728         install-am install-data install-data-am install-dvi \
    729         install-dvi-am install-exec install-exec-am install-html \
    730         install-html-am install-info install-info-am install-man \
    731         install-pdf install-pdf-am install-ps install-ps-am \
    732         install-strip install-tools_prettyprinterPROGRAMS installcheck \
     796        clean-libtool clean-tools_prettyprinterPROGRAMS cscopelist-am \
     797        ctags ctags-am distclean distclean-compile distclean-generic \
     798        distclean-libtool distclean-tags distdir dvi dvi-am html \
     799        html-am info info-am install install-am install-data \
     800        install-data-am install-dvi install-dvi-am install-exec \
     801        install-exec-am install-html install-html-am install-info \
     802        install-info-am install-man install-pdf install-pdf-am \
     803        install-ps install-ps-am install-strip \
     804        install-tools_prettyprinterPROGRAMS installcheck \
    733805        installcheck-am installdirs maintainer-clean \
    734806        maintainer-clean-generic mostlyclean mostlyclean-compile \
    735         mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
    736         uninstall-am uninstall-tools_prettyprinterPROGRAMS
     807        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
     808        tags tags-am uninstall uninstall-am \
     809        uninstall-tools_prettyprinterPROGRAMS
    737810
    738811.PRECIOUS: Makefile
Note: See TracChangeset for help on using the changeset viewer.