Changeset 3140 for trunk/src/kmk/Makefile.am

Timestamp:

Mar 14, 2018, 10:28:10 PM (7 years ago)

Author:

bird

Message:

kmk: Merged in changes from GNU make 4.2.1 (2e55f5e4abdc0e38c1d64be703b446695e70b3b6 / ​https://git.savannah.gnu.org/git/make.git).

Location:

trunk/src/kmk

Files:

• . (modified) (1 prop)
• Makefile.am (modified) (16 diffs)

trunk/src/kmk/Makefile.am

@@ -1 +1 @@
 # This is a -*-Makefile-*-, or close enough
 #
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 1997-2016 Free Software Foundation, Inc.
 # This file is part of GNU Make.
 #
@@ -18 +17 @@
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 
-AUTOMAKE_OPTIONS = 1.8 dist-bzip2 check-news
-ACLOCAL_AMFLAGS =  -I config
+AUTOMAKE_OPTIONS = dist-bzip2 silent-rules std-options
+ACLOCAL_AMFLAGS = -I config
 
 MAKE_HOST =     @MAKE_HOST@
@@ -28 +27 @@
   W32INC =      -I $(top_srcdir)/w32/include
   W32LIB =      -Lw32 -lw32
+  ossrc =
+else
+  ossrc =       posixos.c
 endif
 
@@ -35 +37 @@
 
 bin_PROGRAMS =  kmk kmk_redirect
+include_HEADERS = gnumake.h
 
 if USE_CUSTOMS
@@ -42 +45 @@
 endif
 
-
 kmk_SOURCES =   ar.c arscan.c commands.c default.c dir.c expand.c file.c \
-                function.c getopt.c getopt1.c implicit.c job.c main.c \
-                misc.c read.c remake.c $(remote) rule.c signame.c \
-                strcache.c variable.c version.c vpath.c hash.c \
+                function.c getopt.c getopt1.c guile.c implicit.c job.c load.c \
+                loadapi.c main.c misc.c $(ossrc) output.c read.c remake.c \
+                rule.c signame.c strcache.c variable.c version.c vpath.c \
+                hash.c $(remote) \
                 \
                 expreval.c \
@@ -101 +104 @@
 kmk_redirect_CFLAGS = -UKMK
 
-
 EXTRA_kmk_SOURCES = vmsjobs.c remote-stub.c remote-cstms.c
 
-noinst_HEADERS = commands.h dep.h filedef.h job.h make.h rule.h variable.h \
-                debug.h getopt.h gettext.h hash.h
+noinst_HEADERS = commands.h dep.h filedef.h job.h makeint.h rule.h variable.h \
+                debug.h getopt.h gettext.h hash.h output.h os.h
 
 #kmk_LDADD =    @LIBOBJS@ @ALLOCA@ $(GLOBLIB) @GETLOADAVG_LIBS@ @LIBINTL@
-kmk_LDADD =     @LIBOBJS@ @ALLOCA@ $(GLOBLIB) @GETLOADAVG_LIBS@
+kmk_LDADD =     @LIBOBJS@ @ALLOCA@ $(GLOBLIB) @GETLOADAVG_LIBS@ \
+                $(GUILE_LIBS)
 # Only process if target is MS-Windows
 if WINDOWSENV
@@ -184 +187 @@
 
 AM_CPPFLAGS =   $(GLOBINC) -I$(srcdir)/../lib -I$(srcdir)/../lib/kStuff/include
+AM_CFLAGS =     $(GUILE_CFLAGS)
 # Only process if target is MS-Windows
 if WINDOWSENV
@@ -192 +196 @@
 # Extra stuff to include in the distribution.
 
-EXTRA_DIST =    README build.sh.in $(man_MANS) \
+EXTRA_DIST =    ChangeLog README build.sh.in $(man_MANS) \
                 README.customs README.OS2 \
                 SCOPTIONS SMakefile \
@@ -199 +203 @@
                 README.W32 NMakefile config.h.W32 build_w32.bat subproc.bat \
                 make_msvc_net2003.sln make_msvc_net2003.vcproj \
-                readme.vms makefile.vms makefile.com config.h-vms \
-                vmsdir.h vmsfunctions.c vmsify.c
+                README.VMS makefile.vms makefile.com config.h-vms \
+                vmsdir.h vmsfunctions.c vmsify.c vms_exit.c vms_progname.c \
+                vms_export_symbol.c vms_export_symbol_test.com \
+                gmk-default.scm gmk-default.h
 
 # This is built during configure, but behind configure's back
@@ -206 +212 @@
 DISTCLEANFILES = build.sh
 
-# Forward targets
-
-html:
-        cd doc && $(MAKE) $(AM_MAKEFLAGS) $@
-
-.PHONY: html
-
 # --------------- Internationalization Section
 
@@ -223 +222 @@
 
 # Whether or not make needs to be installed setgid.
-# The value should be either `true' or `false'.
-# On many systems, the getloadavg function (used to implement the `-l'
+# The value should be either 'true' or 'false'.
+# On many systems, the getloadavg function (used to implement the '-l'
 # switch) will not work unless make is installed setgid kmem.
 #
@@ -240 +239 @@
            else \
              echo "$$app needs to be owned by group $(inst_group) and setgid;"; \
-             echo "otherwise the \`-l' option will probably not work."; \
+             echo "otherwise the '-l' option will probably not work."; \
              echo "You may need special privileges to complete the installation"; \
              echo "of $$app."; \
@@ -246 +245 @@
          else true; fi
 
+# --------------- Generate the Guile default module content
+
+guile.$(OBJEXT): gmk-default.h
+gmk-default.h: $(srcdir)/gmk-default.scm
+        (echo 'static const char *const GUILE_module_defn = " '\\ \
+          && sed -e 's/;.*//' -e '/^[ \t]*$$/d' -e 's/"/\\"/g' -e 's/$$/ \\/' \
+                 $(srcdir)/gmk-default.scm \
+          && echo '";') > $@
+
 # --------------- Local DIST Section
 
@@ -252 +260 @@
 dist-hook:
         (cd $(srcdir); \
-         sub=`find w32 tests -follow \( -name CVS -prune -o -name .cvsignore -o -name work -prune \) -o \( -name \*.orig -o -name \*.rej -o -name \*~ -prune \) -o -type f -print`; \
+         sub=`find w32 tests -follow \( -name .git -o -name .deps -o -name work -o -name .gitignore -o -name \*.orig -o -name \*.rej -o -name \*~ -o -name Makefile \) -prune -o -type f -print`; \
          tar chf - $$sub) \
         | (cd $(distdir); tar xfBp -)
@@ -290 +298 @@
 MAKETESTFLAGS =
 
-check-regression:
-        @if test -f "$(srcdir)/tests/run_make_tests"; then \
+check-regression: tests/config-flags.pm
+        @if test -f '$(srcdir)/tests/run_make_tests'; then \
+          ulimit -n 128; \
           if $(PERL) -v >/dev/null 2>&1; then \
-            case `cd $(srcdir); pwd` in `pwd`) : ;; \
+            case `cd '$(srcdir)'; pwd` in `pwd`) : ;; \
               *) test -d tests || mkdir tests; \
                  rm -f srctests; \
-                 if ln -s "$(srcdir)/tests" srctests; then \
+                 if ln -s '$(srcdir)/tests' srctests; then \
                    for f in run_make_tests run_make_tests.pl test_driver.pl scripts; do \
                      rm -f tests/$$f; ln -s ../srctests/$$f tests; \
                    done; fi ;; \
             esac; \
-            echo "cd tests && $(PERL) ./run_make_tests.pl -make ../make$(EXEEXT) $(MAKETESTFLAGS)"; \
-            cd tests && $(PERL) ./run_make_tests.pl -make ../make$(EXEEXT) $(MAKETESTFLAGS); \
+            echo "cd tests && $(PERL) ./run_make_tests.pl -srcdir $(abs_srcdir) -make ../make$(EXEEXT) $(MAKETESTFLAGS)"; \
+            cd tests && $(PERL) ./run_make_tests.pl -srcdir '$(abs_srcdir)' -make '../make$(EXEEXT)' $(MAKETESTFLAGS); \
           else \
             echo "Can't find a working Perl ($(PERL)); the test suite requires Perl."; \
           fi; \
-         else \
+        else \
           echo "Can't find the GNU Make test suite ($(srcdir)/tests)."; \
-         fi
+        fi
 
 
@@ -314 +323 @@
 
 # Tell automake that I haven't forgotten about this file and it will be
-# created before we build a distribution (see maintMakefile in the CVS
+# created before we build a distribution (see maintMakefile in the Git
 # distribution).