Changeset 90152a4 for Makefile.in

Timestamp:

Aug 27, 2018, 4:40:34 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

b7c89aa

Parents:

f9feab8 (diff), 305581d (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' into cleanup-dtors

File:

• Makefile.in (modified) (18 diffs)

Makefile.in

@@ -17 +17 @@
 ######################## -*- Mode: Makefile-Automake -*- ######################
 ###############################################################################
+
 VPATH = @srcdir@
 am__is_gnu_make = { \
@@ -93 +94 @@
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/automake/cfa.m4 \
+        $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)
@@ -162 +164 @@
 NROFF = nroff
 MANS = $(man1_MANS)
+DATA = $(noinst_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
   distclean-recursive maintainer-clean-recursive
@@ -170 +173 @@
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
         cscope distdir dist dist-all distcheck
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
-        $(LISP)config.h.in
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -192 +194 @@
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
-        $(top_srcdir)/automake/compile \
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/automake/compile \
         $(top_srcdir)/automake/config.guess \
         $(top_srcdir)/automake/config.sub \
         $(top_srcdir)/automake/install-sh \
-        $(top_srcdir)/automake/missing INSTALL README automake/compile \
-        automake/config.guess automake/config.sub automake/depcomp \
-        automake/install-sh automake/missing automake/ylwrap
+        $(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
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
@@ -250 +252 @@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BACKEND_CC = @BACKEND_CC@               # C compiler used to compile Cforall programs, versus C++ compiler used to build cfa command
+BACKEND_CC = @BACKEND_CC@     # C compiler used to compile Cforall programs, versus C++ compiler used to build cfa command
+BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
 CC = @CC@
 CCAS = @CCAS@
@@ -256 +259 @@
 CCASFLAGS = @CCASFLAGS@
 CCDEPMODE = @CCDEPMODE@
+CFACC = @CFACC@
+CFACPP = @CFACPP@
 CFA_BACKEND_CC = @CFA_BACKEND_CC@
 CFA_BINDIR = @CFA_BINDIR@
@@ -272 +277 @@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DRIVER_DIR = @DRIVER_DIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -278 +284 @@
 EXEEXT = @EXEEXT@
 GREP = @GREP@
+HOST_FLAGS = @HOST_FLAGS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -287 +294 @@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
+LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
-MACHINE_TYPE = @MACHINE_TYPE@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
@@ -307 +314 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TARGET_HOSTS = @TARGET_HOSTS@
 VERSION = @VERSION@
 YACC = @YACC@
@@ -362 +370 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AUTOMAKE_OPTIONS = foreign              # do not require all the GNU file names
-SUBDIRS = src/driver src src/prelude src/libcfa # order important, src before prelude because cfa-cpp used to build prelude
-EXTRA_DIST = Docs                       # non-source files
-MAINTAINERCLEANFILES = lib/* bin/* src/examples/.deps/* src/tests/.deps/* src/tests/.out/*
+AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
+MAINTAINERCLEANFILES = lib/* bin/* tests/.deps/* tests/.out/*
+SUBDIRS = driver src . @LIBCFA_TARGET_DIRS@
+noinst_DATA = @LIBCFA_TARGET_MAKEFILES@
 man1_MANS = doc/man/cfa.1
+debug = yes
 all: config.h
         $(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -373 +382 @@
 am--refresh: Makefile
         @:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
         @for dep in $?; do \
           case '$(am__configure_deps)' in \
@@ -399 +408 @@
         $(SHELL) ./config.status --recheck
 
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
         $(am__cd) $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
         $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 $(am__aclocal_m4_deps):
@@ -409 +418 @@
         @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
 
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+stamp-h1: $(top_srcdir)/src/config.h.in $(top_builddir)/config.status
         @rm -f stamp-h1
         cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
+$(top_srcdir)/src/config.h.in:  $(am__configure_deps) 
         ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
         rm -f stamp-h1
@@ -757 +766 @@
 check-am: all-am
 check: check-recursive
-all-am: Makefile $(MANS) config.h
+all-am: Makefile $(MANS) $(DATA) config.h
 installdirs: installdirs-recursive
 installdirs-am:
@@ -770 +779 @@
 install-am: all-am
         @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
 install-strip:
         if test -z '$(STRIP)'; then \
@@ -885 +892 @@
 .PRECIOUS: Makefile
 
+ # order important
+
+@LIBCFA_TARGET_MAKEFILES@ : Makefile $(srcdir)/libcfa/configure
+        @$(eval config_file = $(dir $@)config.data)
+        @ls $(config_file) || (echo "Missing config.data, re-run configure script again" && false)
+        @$(eval config_data = $(shell cat $(config_file)))
+        @echo "Configuring libcfa with '$(config_data)''"
+        @cd $(dir $@) && $(abs_top_srcdir)/libcfa/configure $(config_data)
+check:
+        $(MAKE) -C tests all-tests installed=no debug=${debug}
+
+installcheck:
+        $(MAKE) -C tests all-tests installed=yes debug=${debug}
+
+status: @LIBCFA_TARGET_MAKEFILES@
+        @echo -ne "translator\n\t"
+        @./config.status --config | sed "s/ /\n\t/g; s/\t'/\t/g; s/'\n/\n/g; s/^'//g; s/'$$//g"
+        @find libcfa -name config.status -printf "\n%h\n\t" -exec {} --config \; | sed "s/ /\n\t/g; s/\t'/\t/g; s/'\n/\n/g; s/^'//g; s/'$$//g"
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.