Changes in Makefile.in [575a6e5:7fb69f6]

File:

• Makefile.in (modified) (10 diffs)

Makefile.in

@@ -17 +17 @@
 ######################## -*- Mode: Makefile-Automake -*- ######################
 ###############################################################################
-
 VPATH = @srcdir@
 am__is_gnu_make = { \
@@ -94 +93 @@
 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)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)
@@ -164 +162 @@
 NROFF = nroff
 MANS = $(man1_MANS)
-DATA = $(noinst_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
   distclean-recursive maintainer-clean-recursive
@@ -252 +249 @@
 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@
+BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
 CC = @CC@
 CCAS = @CCAS@
@@ -293 +291 @@
 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@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
@@ -313 +310 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
-TARGET_HOSTS = @TARGET_HOSTS@
 VERSION = @VERSION@
 YACC = @YACC@
@@ -369 +365 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-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@
+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/*
 man1_MANS = doc/man/cfa.1
-debug = yes
 all: config.h
         $(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -765 +760 @@
 check-am: all-am
 check: check-recursive
-all-am: Makefile $(MANS) $(DATA) config.h
+all-am: Makefile $(MANS) config.h
 installdirs: installdirs-recursive
 installdirs-am:
@@ -778 +773 @@
 install-am: all-am
         @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
 install-strip:
         if test -z '$(STRIP)'; then \
@@ -891 +888 @@
 .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}
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.