Changeset 937e51d for Makefile.in

Timestamp:

Jun 26, 2015, 4:00:26 PM (11 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, stuck-waitfor-destruct, with_gc

Children:

0df292b, e0ff3e6

Parents:

eb50842 (diff), 1869adf (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 pointer to pointer to qualified fix into master

File:

• Makefile.in (modified) (13 diffs)

Makefile.in

@@ -15 +15 @@
 
 @SET_MAKE@
+
+######################## -*- Mode: Makefile-Automake -*- ######################
+###############################################################################
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
@@ -35 +38 @@
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
         $(srcdir)/Makefile.in $(srcdir)/config.h.in \
-        $(top_srcdir)/configure $(top_srcdir)/driver/Makefile.in \
-        $(top_srcdir)/libcfa/Makefile.in $(top_srcdir)/src/Makefile.in \
-        $(top_srcdir)/src/examples/Makefile.in AUTHORS INSTALL TODO \
-        install-sh missing mkinstalldirs
+        $(top_srcdir)/configure INSTALL automake/compile \
+        automake/depcomp automake/install-sh automake/missing \
+        automake/ylwrap
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = src/Makefile driver/Makefile libcfa/Makefile \
-        src/examples/Makefile
+CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
@@ -108 +109 @@
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
@@ -113 +115 @@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BACKEND_CC = @BACKEND_CC@
+BACKEND_CC = @BACKEND_CC@               # C compiler used to compile Cforall programs, versus C++ compiler used to build cfa command
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -123 +125 @@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CPP_PATH = @CPP_PATH@
 CXX = @CXX@
 CXXDEPMODE = @CXXDEPMODE@
@@ -149 +150 @@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
@@ -160 +162 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -199 +202 @@
 pdfdir = @pdfdir@
 prefix = @prefix@
-preludedir = @preludedir@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -210 +212 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = driver libcfa src
-
-# non-source files
-EXTRA_DIST = Docs
+AUTOMAKE_OPTIONS = foreign              # do not require all the GNU file names
+SUBDIRS = src/driver src src/libcfa     # order important, src before libcfa because cfa-cpp used to build prelude
+EXTRA_DIST = Docs                       # non-source files
 all: config.h
         $(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -220 +221 @@
 am--refresh: Makefile
         @:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
         @for dep in $?; do \
           case '$(am__configure_deps)' in \
@@ -247 +248 @@
         $(SHELL) ./config.status --recheck
 
-$(top_srcdir)/configure:  $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
         $(am__cd) $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
         $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 $(am__aclocal_m4_deps):
@@ -260 +261 @@
         @rm -f stamp-h1
         cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in:  $(am__configure_deps) 
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
         ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
         rm -f stamp-h1
@@ -267 +268 @@
 distclean-hdr:
         -rm -f config.h stamp-h1
-src/Makefile: $(top_builddir)/config.status $(top_srcdir)/src/Makefile.in
-        cd $(top_builddir) && $(SHELL) ./config.status $@
-driver/Makefile: $(top_builddir)/config.status $(top_srcdir)/driver/Makefile.in
-        cd $(top_builddir) && $(SHELL) ./config.status $@
-libcfa/Makefile: $(top_builddir)/config.status $(top_srcdir)/libcfa/Makefile.in
-        cd $(top_builddir) && $(SHELL) ./config.status $@
-src/examples/Makefile: $(top_builddir)/config.status $(top_srcdir)/src/examples/Makefile.in
-        cd $(top_builddir) && $(SHELL) ./config.status $@
 
 # This directory's subdirectories are mostly independent; you can cd