Changeset 690166d for Makefile.in

Timestamp:

Jan 11, 2019, 3:21:59 PM (5 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:

• Makefile.in (modified) (15 diffs)

Makefile.in

@@ -94 +94 @@
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/automake/cfa.m4 \
-        $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/automake/libtool.m4 \
+        $(top_srcdir)/automake/ltoptions.m4 \
+        $(top_srcdir)/automake/ltsugar.m4 \
+        $(top_srcdir)/automake/ltversion.m4 \
+        $(top_srcdir)/automake/lt~obsolete.m4 \
+        $(top_srcdir)/automake/cfa.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)
@@ -198 +202 @@
         $(top_srcdir)/automake/config.sub \
         $(top_srcdir)/automake/install-sh \
+        $(top_srcdir)/automake/ltmain.sh \
         $(top_srcdir)/automake/missing $(top_srcdir)/src/config.h.in \
         INSTALL README automake/compile automake/config.guess \
         automake/config.sub automake/depcomp automake/install-sh \
-        automake/missing automake/ylwrap
+        automake/ltmain.sh automake/missing automake/ylwrap
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
@@ -248 +253 @@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -271 +277 @@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
+CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
@@ -276 +283 @@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DRIVER_DIR = @DRIVER_DIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -282 +292 @@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FGREP = @FGREP@
 GREP = @GREP@
 HOST_FLAGS = @HOST_FLAGS@
@@ -289 +300 @@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -297 +309 @@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -310 +332 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -321 +344 @@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
@@ -370 +395 @@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
+ACLOCAL_AMFLAGS = -I automake
 MAINTAINERCLEANFILES = lib/* bin/* tests/.deps/* tests/.out/*
 SUBDIRS = driver src . @LIBCFA_TARGET_DIRS@
@@ -427 +453 @@
 distclean-hdr:
         -rm -f config.h stamp-h1
+
+mostlyclean-libtool:
+        -rm -f *.lo
+
+clean-libtool:
+        -rm -rf .libs _libs
+
+distclean-libtool:
+        -rm -f libtool config.lt
 install-man1: $(man1_MANS)
         @$(NORMAL_INSTALL)
@@ -802 +837 @@
 clean: clean-recursive
 
-clean-am: clean-generic mostlyclean-am
+clean-am: clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-recursive
         -rm -f $(am__CONFIG_DISTCLEAN_FILES)
         -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
+distclean-am: clean-am distclean-generic distclean-hdr \
+        distclean-libtool distclean-tags
 
 dvi: dvi-recursive
@@ -857 +893 @@
 mostlyclean: mostlyclean-recursive
 
-mostlyclean-am: mostlyclean-generic
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 
 pdf: pdf-recursive
@@ -875 +911 @@
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
         am--refresh check check-am clean clean-cscope clean-generic \
-        cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
-        dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
-        distcheck distclean distclean-generic distclean-hdr \
-        distclean-tags distcleancheck distdir distuninstallcheck dvi \
-        dvi-am html html-am info info-am install install-am \
-        install-data install-data-am install-dvi install-dvi-am \
-        install-exec install-exec-am install-html install-html-am \
-        install-info install-info-am install-man install-man1 \
-        install-pdf install-pdf-am install-ps install-ps-am \
-        install-strip installcheck installcheck-am installdirs \
-        installdirs-am maintainer-clean maintainer-clean-generic \
-        mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
-        tags-am uninstall uninstall-am uninstall-man uninstall-man1
+        clean-libtool cscope cscopelist-am ctags ctags-am dist \
+        dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
+        dist-xz dist-zip distcheck distclean distclean-generic \
+        distclean-hdr distclean-libtool distclean-tags distcleancheck \
+        distdir distuninstallcheck dvi dvi-am html html-am info \
+        info-am install install-am install-data install-data-am \
+        install-dvi install-dvi-am install-exec install-exec-am \
+        install-html install-html-am install-info install-info-am \
+        install-man install-man1 install-pdf install-pdf-am install-ps \
+        install-ps-am install-strip installcheck installcheck-am \
+        installdirs installdirs-am maintainer-clean \
+        maintainer-clean-generic mostlyclean mostlyclean-generic \
+        mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+        uninstall-am uninstall-man uninstall-man1
 
 .PRECIOUS: Makefile