Changeset 3140 in kBuild for trunk/src/kmk/maintMakefile

Timestamp:

Mar 14, 2018 9: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)
• maintMakefile (modified) (11 diffs)

trunk/src/kmk/maintMakefile

@@ -1 +1 @@
 # Maintainer-only makefile segment.  This contains things that are relevant
-# only if you have the full copy of the GNU make sources from the CVS
+# only if you have the full copy of the GNU make sources from the Git
 # tree, not a dist copy.
+
+BUGLIST := bug-make@gnu.org
+
+# These are related to my personal setup.
+GPG_FINGERPRINT := 6338B6D4
+
+# SRCROOTDIR is just a handy location to keep source files in
+SRCROOTDIR ?= $(HOME)/src
+
+# Where the gnulib project has been locally cloned
+GNULIBDIR ?= $(SRCROOTDIR)/gnulib
+
+# Where to put the CVS checkout of the GNU web repository
+GNUWEBDIR ?= $(SRCROOTDIR)/gnu-www
+
+# Where to put the CVS checkout of the GNU make web repository
+MAKEWEBDIR ?= $(SRCROOTDIR)/make/make-web
 
 # We like mondo-warnings!
 ifeq ($(KBUILD_TARGET),openbsd) # bird
-AM_CFLAGS += -Wall -Wshadow -Wpointer-arith -Wbad-function-cast
+AM_CFLAGS += -Wall -Wwrite-strings -Wshadow -Wpointer-arith -Wbad-function-cast
 else
-AM_CFLAGS += -Wall -Wextra -Wdeclaration-after-statement -Wshadow -Wpointer-arith -Wbad-function-cast
+AM_CFLAGS += -Wall -Wwrite-strings -Wextra -Wdeclaration-after-statement -Wshadow -Wpointer-arith -Wbad-function-cast
 endif
+
+MAKE_MAINTAINER_MODE := -DMAKE_MAINTAINER_MODE
+AM_CPPFLAGS += $(MAKE_MAINTAINER_MODE)
 
 # I want this one but I have to wait for the const cleanup!
@@ -23 +43 @@
 # These are built as a side-effect of the dist rule
 #all-am: $(TEMPLATES) $(MTEMPLATES) build.sh.in
+
+# Create preprocessor output files--GCC specific!
+%.i : %.c
+        $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) -E -dD -o $@ $<
 
 # General rule for turning a .template into a regular file.
@@ -85 +109 @@
          done) > $@
 
-# Get rid of everything "else".
-#
-maintFILES = configure aclocal.m4 config.h.in Makefile.in stamp-h.in
-
-CVS-CLEAN-FILES +=      $(maintFILES) $(TEMPLATES) $(MTEMPLATES) NMakefile \
-                        build.sh.in .deps .dep_segment ABOUT-NLS \
-                        ansi2knr.*
-
-# This rule tries to clean the tree right down to how it looks when you do a
-# virgin CVS checkout.
-
-# This target is potentially dangerous since it removes _ANY FILE_ that
-# is not in CVS.  Including files you might mean to add to CVS but
-# haven't yet...  I only use this in subdirectories where it's unlikely
-# we have any new files.  Still... be careful!!
-
-cvsclean = $(PERL) -e '$$k{CVS} = 1; open(E,"< CVS/Entries") || die "CVS/Entries: $$!\n"; while (defined ($$_ = <E>)) { m%^/([^/]*)% or next; $$k{$$1} = 1; } close(E) || die "CVS/Entries: $$!\n"; opendir(D, ".") || die ".: $$!\n"; while (defined ($$_ = readdir(D))) { -f $$_ && ! exists $$k{$$_} && unlink($$_); } closedir(D) || die ".: $$!\n";'
-
-.PHONY: cvs-clean
-cvs-clean: maintainer-clean
-        -rm -rf *~ $(CVS-CLEAN-FILES)
-        -cd config && $(cvsclean)
-        -cd po     && $(cvsclean)
-        -cd doc    && $(cvsclean)
-        -cd glob   && $(cvsclean)
-
-
-# ----------------------------------------------------------------------
-#
-# The sections below were stolen from the Makefile.maint used by fileutils,
-# sh-utils, textutils, CPPI, Bison, and Autoconf.
+# Cleaning
+
+GIT :=  git
+
+# git-clean:      Clean all "ignored" files.  Leave untracked files.
+# git-very-clean: Clean all files that aren't stored in source control.
+
+.PHONY: git-clean git-very-clean
+git-clean:
+        -$(GIT) clean -fdX
+git-very-clean: git-clean
+        -$(GIT) clean -fd
+
+
+
+## ---------------------- ##
+## Generating ChangeLog.  ##
+## ---------------------- ##
+
+gl2cl-date := 2013-10-10
+gl2cl := $(GNULIBDIR)/build-aux/gitlog-to-changelog
+
+# Rebuild the changelog whenever a new commit is added
+ChangeLog: .check-git-HEAD
+        if test -f '$(gl2cl)'; then \
+            '$(gl2cl)' --since='$(gl2cl-date)' > '$@'; \
+        else \
+            echo "WARNING: $(gl2cl) is not available.  No $@ generated."; \
+        fi
+
+.PHONY: .check-git-HEAD
+.check-git-HEAD:
+        sha="`git rev-parse HEAD`"; \
+        [ -f '$@' ] && [ "`cat '$@' 2>/dev/null`" = "$$sha" ] \
+            || echo "$$sha" > '$@'
 
 
@@ -121 +149 @@
 ## Updating files.  ##
 ## ---------------- ##
-
-WGET = wget --passive-ftp -nv
+RSYNC = rsync -Lrtvz
+WGET = wget --passive-ftp -np -nv
 ftp-gnu = ftp://ftp.gnu.org/gnu
 
@@ -128 +156 @@
                     echo $(target) is unchanged; rm -f $(target).t; \
                   else \
-                    mv $(target).t $(target); \
+                    mv -f $(target).t $(target); \
                   fi
 
@@ -140 +168 @@
 #   ftp://tiger.informatik.hu-berlin.de/pub/po/maint/
 
+po_wget_flags = --recursive --level=1 --no-directories --no-check-certificate
 po_repo = http://translationproject.org/latest/$(PACKAGE)
+po_sync = translationproject.org::tp/latest/$(PACKAGE)/
+
 .PHONY: do-po-update po-update
 do-po-update:
@@ -146 +177 @@
           && rm -rf "$$tmppo" \
           && mkdir "$$tmppo" \
-          && (cd "$$tmppo" \
-                && $(WGET) -r -l1 -nd --no-parent -A '*.po' $(po_repo)) \
-          && cp "$$tmppo"/*.po $(top_srcdir)/po && rm -rf "$$tmppo"
+          && $(RSYNC) $(po_sync)  "$$tmppo" \
+          && cp "$$tmppo"/*.po $(top_srcdir)/po \
+          && rm -rf "$$tmppo"
         cd po && $(MAKE) update-po
         $(MAKE) po-check
@@ -197 +228 @@
 
 
+# ---------------------------------- #
+# Alternative configuration checks.  #
+# ---------------------------------- #
+
+.PHONY: check-alt-config
+check-alt-config: \
+        checkcfg.--disable-job-server \
+        checkcfg.--disable-load \
+        checkcfg.--without-guile \
+        checkcfg.CPPFLAGS^-DNO_OUTPUT_SYNC \
+        checkcfg.CPPFLAGS^-DNO_ARCHIVES
+
+# Trick GNU make so it doesn't run the submake as a recursive make.
+NR_MAKE = $(MAKE)
+
+# Check builds both with build.sh and with make
+checkcfg.%: distdir
+        @echo "Building $@ (output in checkcfg.$*.log)"
+        @exec >'checkcfg.$*.log' 2>&1; \
+           rm -rf $(distdir)/_build \
+        && mkdir $(distdir)/_build \
+        && cd $(distdir)/_build \
+        && echo "Testing configure with $(subst ^,=,$*)" \
+        && ../configure --srcdir=.. $(subst ^,=,$*) \
+                $(AM_DISTCHECK_CONFIGURE_FLAGS) $(DISTCHECK_CONFIGURE_FLAGS) \
+                CFLAGS='$(AM_CFLAGS)' \
+        && ./build.sh \
+        && ./make $(AM_MAKEFLAGS) check \
+        && rm -f *.o make \
+        && $(NR_MAKE) $(AM_MAKEFLAGS) \
+        && ./make $(AM_MAKEFLAGS) check
+
+
 ## --------------- ##
 ## Sanity checks.  ##
 ## --------------- ##
 
-# Checks that don't require cvs.  Run `changelog-check' last as
+# Before we build a distribution be sure we run our local checks
+#distdir: local-check
+
+.PHONY: local-check po-check changelog-check
+
+# Checks that don't require Git.  Run 'changelog-check' last as
 # previous test may reveal problems requiring new ChangeLog entries.
 local-check: po-check changelog-check
@@ -216 +285 @@
 
 # Verify that all source files using _() are listed in po/POTFILES.in.
-# Ignore make.h; it defines _().
+# Ignore makeint.h; it defines _().
 po-check:
         if test -f po/POTFILES.in; then \
           grep '^[^#]' po/POTFILES.in | sort > $@-1; \
-          $(PERL) -wn -e 'if (/\b_\(/) { $$ARGV eq "make.h" || print "$$ARGV\n" and close ARGV }' *.c *.h | sort > $@-2; \
+          $(PERL) -wn -e 'if (/\b_\(/) { $$ARGV eq "./makeint.h" || print "$$ARGV\n" and close ARGV }' `find . -name '*.[ch]'` | sed 's,^\./,,' | sort > $@-2; \
           diff -u $@-1 $@-2 || exit 1; \
           rm -f $@-1 $@-2; \
         fi
 
+
+## --------------- ##
+## Generate docs.  ##
+## --------------- ##
+
+.PHONY: update-makeweb gendocs
+
+CVS = cvs
+
+makeweb-repo = $(USER)@cvs.sv.gnu.org:/web/make
+gnuweb-repo = :pserver:anonymous@cvs.sv.gnu.org:/web/www
+gnuweb-dir = www/server/standards
+
+# Get the GNU make web page boilerplate etc.
+update-makeweb:
+        [ -d '$(MAKEWEBDIR)' ] || mkdir -p '$(MAKEWEBDIR)'
+        [ -d '$(MAKEWEBDIR)'/CVS ] \
+            && { cd '$(MAKEWEBDIR)' && $(CVS) update; } \
+            || { mkdir -p '$(dir $(MAKEWEBDIR))' && cd '$(dir $(MAKEWEBDIR))' \
+                 && $(CVS) -d $(makeweb-repo) co -d '$(notdir $(MAKEWEBDIR))' make; }
+
+# Get the GNU web page boilerplate etc.
+update-gnuweb:
+        [ -d '$(GNUWEBDIR)' ] || mkdir -p '$(GNUWEBDIR)'
+        [ -d '$(GNUWEBDIR)/$(gnuweb-dir)'/CVS ] \
+            && { cd '$(GNUWEBDIR)/$(gnuweb-dir)' && $(CVS) update; } \
+            || { cd '$(GNUWEBDIR)' && $(CVS) -d $(gnuweb-repo) co '$(gnuweb-dir)'; }
+
+gendocs: update-gnuweb update-makeweb
+        cp $(GNULIBDIR)/doc/gendocs_template doc
+        cd doc \
+          && rm -rf doc/manual \
+          && $(GNULIBDIR)/build-aux/gendocs.sh --email '$(BUGLIST)' \
+                make 'GNU Make Manual'
+        find '$(MAKEWEBDIR)'/manual \( -name CVS -prune \) -o \( -name '[!.]*' -type f -exec rm -f '{}' \; \)
+        cp -r doc/manual '$(MAKEWEBDIR)'
+        @echo 'Status of $(MAKEWEBDIR) repo:' && cd '$(MAKEWEBDIR)' \
+            && cvs -q -n update | grep -v '^M ' \
+            && echo '- cvs add <new files>' \
+            && echo '- cvs remove <deleted files>' \
+            && echo '- cvs commit' \
+            && echo '- cvs tag make-$(subst .,-,$(VERSION))'
+
+## ------------------------- ##
+## Make release targets.     ##
+## ------------------------- ##
+
+.PHONY: tag-release
+tag-release:
+        case '$(VERSION)' in \
+            (*.*.9*) message=" candidate" ;; \
+            (*)      message= ;; \
+        esac; \
+        $(GIT) tag -m "GNU Make release$$message $(VERSION)" -u '$(GPG_FINGERPRINT)' '$(VERSION)'
+
 ## ------------------------- ##
 ## GNU FTP upload artifacts. ##
@@ -234 +358 @@
 
 GPG = gpg
-GPGFLAGS = -u 6338B6D4
+GPGFLAGS = -u $(GPG_FINGERPRINT)
 
 DIST_ARCHIVES_SIG = $(addsuffix .sig,$(DIST_ARCHIVES))
@@ -271 +395 @@
 
 
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# Rebuild Makefile.in if this file is modifed.
+Makefile.in: maintMakefile
+
+# Copyright (C) 1997-2016 Free Software Foundation, Inc.
 # This file is part of GNU Make.
 #