Changeset 690166d for src/Makefile.in


Ignore:
Timestamp:
Jan 11, 2019, 3:21:59 PM (7 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum
Children:
def9d4e
Parents:
0689cd9 (diff), 52ffa30 (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

  • src/Makefile.in

    r0689cd9 r690166d  
    141141subdir = src
    142142ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    143 am__aclocal_m4_deps = $(top_srcdir)/automake/cfa.m4 \
    144         $(top_srcdir)/configure.ac
     143am__aclocal_m4_deps = $(top_srcdir)/automake/libtool.m4 \
     144        $(top_srcdir)/automake/ltoptions.m4 \
     145        $(top_srcdir)/automake/ltsugar.m4 \
     146        $(top_srcdir)/automake/ltversion.m4 \
     147        $(top_srcdir)/automake/lt~obsolete.m4 \
     148        $(top_srcdir)/automake/cfa.m4 $(top_srcdir)/configure.ac
    145149am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    146150        $(ACLOCAL_M4)
    … …  
    151155CONFIG_CLEAN_VPATH_FILES =
    152156LIBRARIES = $(noinst_LIBRARIES)
    153 AR = ar
    154157AM_V_AR = $(am__v_AR_@AM_V@)
    155158am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
    … …  
    203206        ResolvExpr/PtrsAssignable.$(OBJEXT) \
    204207        ResolvExpr/PtrsCastable.$(OBJEXT) \
    205         ResolvExpr/RenameVars.$(OBJEXT) ResolvExpr/Resolver.$(OBJEXT) \
     208        ResolvExpr/RenameVars.$(OBJEXT) \
     209        ResolvExpr/ResolveAssertions.$(OBJEXT) \
     210        ResolvExpr/Resolver.$(OBJEXT) \
    206211        ResolvExpr/ResolveTypeof.$(OBJEXT) \
     212        ResolvExpr/SpecCost.$(OBJEXT) \
    207213        ResolvExpr/TypeEnvironment.$(OBJEXT) \
    208214        ResolvExpr/Unify.$(OBJEXT) SymTab/Autogen.$(OBJEXT) \
    … …  
    259265        ResolvExpr/TypeEnvironment.$(OBJEXT) \
    260266        ResolvExpr/CurrentObject.$(OBJEXT) \
    261         ResolvExpr/ExplodedActual.$(OBJEXT) SymTab/Indexer.$(OBJEXT) \
    262         SymTab/Mangler.$(OBJEXT) SymTab/ManglerCommon.$(OBJEXT) \
    263         SymTab/Validate.$(OBJEXT) SymTab/FixFunction.$(OBJEXT) \
    264         SymTab/Autogen.$(OBJEXT) SynTree/Type.$(OBJEXT) \
    265         SynTree/VoidType.$(OBJEXT) SynTree/BasicType.$(OBJEXT) \
    266         SynTree/PointerType.$(OBJEXT) SynTree/ArrayType.$(OBJEXT) \
    267         SynTree/ReferenceType.$(OBJEXT) SynTree/FunctionType.$(OBJEXT) \
     267        ResolvExpr/ExplodedActual.$(OBJEXT) \
     268        ResolvExpr/SpecCost.$(OBJEXT) \
     269        ResolvExpr/ResolveAssertions.$(OBJEXT) \
     270        SymTab/Indexer.$(OBJEXT) SymTab/Mangler.$(OBJEXT) \
     271        SymTab/ManglerCommon.$(OBJEXT) SymTab/Validate.$(OBJEXT) \
     272        SymTab/FixFunction.$(OBJEXT) SymTab/Autogen.$(OBJEXT) \
     273        SynTree/Type.$(OBJEXT) SynTree/VoidType.$(OBJEXT) \
     274        SynTree/BasicType.$(OBJEXT) SynTree/PointerType.$(OBJEXT) \
     275        SynTree/ArrayType.$(OBJEXT) SynTree/ReferenceType.$(OBJEXT) \
     276        SynTree/FunctionType.$(OBJEXT) \
    268277        SynTree/ReferenceToType.$(OBJEXT) SynTree/TupleType.$(OBJEXT) \
    269278        SynTree/TypeofType.$(OBJEXT) SynTree/AttrType.$(OBJEXT) \
    … …  
    289298___driver_cfa_cpp_OBJECTS = $(am____driver_cfa_cpp_OBJECTS)
    290299___driver_cfa_cpp_DEPENDENCIES =
     300AM_V_lt = $(am__v_lt_@AM_V@)
     301am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
     302am__v_lt_0 = --silent
     303am__v_lt_1 =
    291304am_demangler_OBJECTS = SymTab/demangler.$(OBJEXT)
    292305demangler_OBJECTS = $(am_demangler_OBJECTS)
    … …  
    310323CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    311324        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
     325LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
     326        $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
     327        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
     328        $(AM_CXXFLAGS) $(CXXFLAGS)
    312329AM_V_CXX = $(am__v_CXX_@AM_V@)
    313330am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
    … …  
    315332am__v_CXX_1 =
    316333CXXLD = $(CXX)
    317 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
    318         -o $@
     334CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
     335        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
     336        $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
    319337AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
    320338am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
    … …  
    322340am__v_CXXLD_1 =
    323341LEXCOMPILE = $(LEX) $(AM_LFLAGS) $(LFLAGS)
     342LTLEXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
     343        $(LIBTOOLFLAGS) --mode=compile $(LEX) $(AM_LFLAGS) $(LFLAGS)
    324344AM_V_LEX = $(am__v_LEX_@AM_V@)
    325345am__v_LEX_ = $(am__v_LEX_@AM_DEFAULT_V@)
    … …  
    330350                   -e s/c++$$/h++/ -e s/c$$/h/
    331351YACCCOMPILE = $(YACC) $(AM_YFLAGS) $(YFLAGS)
     352LTYACCCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
     353        $(LIBTOOLFLAGS) --mode=compile $(YACC) $(AM_YFLAGS) $(YFLAGS)
    332354AM_V_YACC = $(am__v_YACC_@AM_V@)
    333355am__v_YACC_ = $(am__v_YACC_@AM_DEFAULT_V@)
    … …  
    336358COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
    337359        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
     360LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
     361        $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
     362        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
     363        $(AM_CFLAGS) $(CFLAGS)
    338364AM_V_CC = $(am__v_CC_@AM_V@)
    339365am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
    … …  
    341367am__v_CC_1 =
    342368CCLD = $(CC)
    343 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
     369LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
     370        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
     371        $(AM_LDFLAGS) $(LDFLAGS) -o $@
    344372AM_V_CCLD = $(am__v_CCLD_@AM_V@)
    345373am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
    … …  
    391419AMTAR = @AMTAR@
    392420AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
     421AR = @AR@
    393422AUTOCONF = @AUTOCONF@
    394423AUTOHEADER = @AUTOHEADER@
    … …  
    414443CPPFLAGS = @CPPFLAGS@
    415444CXX = @CXX@
     445CXXCPP = @CXXCPP@
    416446CXXDEPMODE = @CXXDEPMODE@
    417447CXXFLAGS = @CXXFLAGS@
    … …  
    419449DEFS = @DEFS@
    420450DEPDIR = @DEPDIR@
     451DLLTOOL = @DLLTOOL@
    421452DRIVER_DIR = @DRIVER_DIR@
     453DSYMUTIL = @DSYMUTIL@
     454DUMPBIN = @DUMPBIN@
    422455ECHO_C = @ECHO_C@
    423456ECHO_N = @ECHO_N@
    … …  
    425458EGREP = @EGREP@
    426459EXEEXT = @EXEEXT@
     460FGREP = @FGREP@
    427461GREP = @GREP@
    428462HOST_FLAGS = @HOST_FLAGS@
    … …  
    432466INSTALL_SCRIPT = @INSTALL_SCRIPT@
    433467INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
     468LD = @LD@
    434469LDFLAGS = @LDFLAGS@
    435470LEX = @LEX@
    … …  
    440475LIBOBJS = @LIBOBJS@
    441476LIBS = @LIBS@
     477LIBTOOL = @LIBTOOL@
     478LIPO = @LIPO@
     479LN_S = @LN_S@
    442480LTLIBOBJS = @LTLIBOBJS@
     481LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
    443482MAKEINFO = @MAKEINFO@
     483MANIFEST_TOOL = @MANIFEST_TOOL@
    444484MKDIR_P = @MKDIR_P@
     485NM = @NM@
     486NMEDIT = @NMEDIT@
     487OBJDUMP = @OBJDUMP@
    445488OBJEXT = @OBJEXT@
     489OTOOL = @OTOOL@
     490OTOOL64 = @OTOOL64@
    446491PACKAGE = @PACKAGE@
    447492PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
    … …  
    453498PATH_SEPARATOR = @PATH_SEPARATOR@
    454499RANLIB = @RANLIB@
     500SED = @SED@
    455501SET_MAKE = @SET_MAKE@
    456502SHELL = @SHELL@
    … …  
    464510abs_top_builddir = @abs_top_builddir@
    465511abs_top_srcdir = @abs_top_srcdir@
     512ac_ct_AR = @ac_ct_AR@
    466513ac_ct_CC = @ac_ct_CC@
    467514ac_ct_CXX = @ac_ct_CXX@
     515ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
    468516am__include = @am__include@
    469517am__leading_dot = @am__leading_dot@
    … …  
    515563# create object files in directory with source files
    516564AUTOMAKE_OPTIONS = foreign subdir-objects
     565ACLOCAL_AMFLAGS = -I automake
    517566SRC = main.cc MakeLibCfa.cc CompilationState.cc CodeGen/Generate.cc \
    518567        CodeGen/CodeGenerator.cc CodeGen/GenType.cc \
    … …  
    546595        ResolvExpr/Occurs.cc ResolvExpr/TypeEnvironment.cc \
    547596        ResolvExpr/CurrentObject.cc ResolvExpr/ExplodedActual.cc \
     597        ResolvExpr/SpecCost.cc ResolvExpr/ResolveAssertions.cc \
    548598        SymTab/Indexer.cc SymTab/Mangler.cc SymTab/ManglerCommon.cc \
    549599        SymTab/Validate.cc SymTab/FixFunction.cc SymTab/Autogen.cc \
    … …  
    653703  ResolvExpr/PtrsCastable.cc \
    654704  ResolvExpr/RenameVars.cc \
     705  ResolvExpr/ResolveAssertions.cc \
    655706  ResolvExpr/Resolver.cc \
    656707  ResolvExpr/ResolveTypeof.cc \
     708  ResolvExpr/SpecCost.cc \
    657709  ResolvExpr/TypeEnvironment.cc \
    658710  ResolvExpr/Unify.cc \
    … …  
    671723
    672724.SUFFIXES:
    673 .SUFFIXES: .cc .ll .o .obj .yy
     725.SUFFIXES: .cc .ll .lo .o .obj .yy
    674726$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/CodeGen/module.mk $(srcdir)/CodeTools/module.mk $(srcdir)/Concurrency/module.mk $(srcdir)/Common/module.mk $(srcdir)/ControlStruct/module.mk $(srcdir)/GenPoly/module.mk $(srcdir)/InitTweak/module.mk $(srcdir)/Parser/module.mk $(srcdir)/ResolvExpr/module.mk $(srcdir)/SymTab/module.mk $(srcdir)/SynTree/module.mk $(srcdir)/Tuples/module.mk $(srcdir)/Validate/module.mk $(srcdir)/Virtual/module.mk $(am__configure_deps)
    675727        @for dep in $?; do \
    … …  
    903955ResolvExpr/RenameVars.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
    904956        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
     957ResolvExpr/ResolveAssertions.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
     958        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
    905959ResolvExpr/Resolver.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
    906960        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
    907961ResolvExpr/ResolveTypeof.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
     962        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
     963ResolvExpr/SpecCost.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
    908964        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
    909965ResolvExpr/TypeEnvironment.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
    … …  
    9561012        sed 's/$(EXEEXT)$$//' | \
    9571013        while read p p1; do if test -f $$p \
     1014         || test -f $$p1 \
    9581015          ; then echo "$$p"; echo "$$p"; else :; fi; \
    9591016        done | \
    … …  
    9701027            if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
    9711028            test -z "$$files" || { \
    972               echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(cfa_cpplibdir)$$dir'"; \
    973               $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(cfa_cpplibdir)$$dir" || exit $$?; \
     1029            echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(cfa_cpplibdir)$$dir'"; \
     1030            $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(cfa_cpplibdir)$$dir" || exit $$?; \
    9741031            } \
    9751032        ; done
    … …  
    9871044
    9881045clean-cfa_cpplibPROGRAMS:
    989         -test -z "$(cfa_cpplib_PROGRAMS)" || rm -f $(cfa_cpplib_PROGRAMS)
     1046        @list='$(cfa_cpplib_PROGRAMS)'; test -n "$$list" || exit 0; \
     1047        echo " rm -f" $$list; \
     1048        rm -f $$list || exit $$?; \
     1049        test -n "$(EXEEXT)" || exit 0; \
     1050        list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
     1051        echo " rm -f" $$list; \
     1052        rm -f $$list
    9901053CodeGen/Generate.$(OBJEXT): CodeGen/$(am__dirstamp) \
    9911054        CodeGen/$(DEPDIR)/$(am__dirstamp)
    … …  
    11571220@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/PtrsCastable.Po@am__quote@
    11581221@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/RenameVars.Po@am__quote@
     1222@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/ResolveAssertions.Po@am__quote@
    11591223@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/ResolveTypeof.Po@am__quote@
    11601224@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/Resolver.Po@am__quote@
     1225@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/SpecCost.Po@am__quote@
    11611226@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/TypeEnvironment.Po@am__quote@
    11621227@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/Unify.Po@am__quote@
    … …  
    12251290@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    12261291
     1292.cc.lo:
     1293@am__fastdepCXX_TRUE@   $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
     1294@am__fastdepCXX_TRUE@   $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     1295@am__fastdepCXX_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Plo
     1296@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
     1297@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1298@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
     1299
    12271300.ll.cc:
    12281301        $(AM_V_LEX)$(am__skiplex) $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE)
    … …  
    12301303.yy.cc:
    12311304        $(AM_V_YACC)$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h `echo $@ | $(am__yacc_c2h)` y.output $*.output -- $(YACCCOMPILE)
     1305
     1306mostlyclean-libtool:
     1307        -rm -f *.lo
     1308
     1309clean-libtool:
     1310        -rm -rf .libs _libs
     1311        -rm -rf ../driver/.libs ../driver/_libs
    12321312
    12331313ID: $(am__tagged_files)
    … …  
    13891469clean: clean-am
    13901470
    1391 clean-am: clean-cfa_cpplibPROGRAMS clean-generic clean-noinstLIBRARIES \
    1392         mostlyclean-am
     1471clean-am: clean-cfa_cpplibPROGRAMS clean-generic clean-libtool \
     1472        clean-noinstLIBRARIES mostlyclean-am
    13931473
    13941474distclean: distclean-am
    … …  
    14451525mostlyclean: mostlyclean-am
    14461526
    1447 mostlyclean-am: mostlyclean-compile mostlyclean-generic
     1527mostlyclean-am: mostlyclean-compile mostlyclean-generic \
     1528        mostlyclean-libtool
    14481529
    14491530pdf: pdf-am
    … …  
    14601541
    14611542.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
    1462         clean-cfa_cpplibPROGRAMS clean-generic clean-noinstLIBRARIES \
    1463         cscopelist-am ctags ctags-am distclean distclean-compile \
    1464         distclean-generic distclean-tags distdir dvi dvi-am html \
    1465         html-am info info-am install install-am \
    1466         install-cfa_cpplibPROGRAMS install-data install-data-am \
    1467         install-dvi install-dvi-am install-exec install-exec-am \
    1468         install-html install-html-am install-info install-info-am \
    1469         install-man install-pdf install-pdf-am install-ps \
    1470         install-ps-am install-strip installcheck installcheck-am \
    1471         installdirs maintainer-clean maintainer-clean-generic \
    1472         mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
    1473         ps ps-am tags tags-am uninstall uninstall-am \
     1543        clean-cfa_cpplibPROGRAMS clean-generic clean-libtool \
     1544        clean-noinstLIBRARIES cscopelist-am ctags ctags-am distclean \
     1545        distclean-compile distclean-generic distclean-libtool \
     1546        distclean-tags distdir dvi dvi-am html html-am info info-am \
     1547        install install-am install-cfa_cpplibPROGRAMS install-data \
     1548        install-data-am install-dvi install-dvi-am install-exec \
     1549        install-exec-am install-html install-html-am install-info \
     1550        install-info-am install-man install-pdf install-pdf-am \
     1551        install-ps install-ps-am install-strip installcheck \
     1552        installcheck-am installdirs maintainer-clean \
     1553        maintainer-clean-generic mostlyclean mostlyclean-compile \
     1554        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
     1555        tags tags-am uninstall uninstall-am \
    14741556        uninstall-cfa_cpplibPROGRAMS
    14751557
Note: See TracChangeset for help on using the changeset viewer.