[gnome-photos] build: Drop ChangeLog and INSTALL, and silence Automake warnings
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-photos] build: Drop ChangeLog and INSTALL, and silence Automake warnings
- Date: Tue, 21 Aug 2018 11:32:39 +0000 (UTC)
commit cc6810224b6a75122faa364e35cb20e89e1a5e0a
Author: Debarshi Ray <debarshir gnome org>
Date: Tue Aug 21 13:14:44 2018 +0200
build: Drop ChangeLog and INSTALL, and silence Automake warnings
The ChangeLog generation was broken forever because it used
$(top_srcdir)/missing, not $(top_srcdir)/config/missing. Including the
Git log in tarballs isn't particularly useful. People are better off
using the Git repository directly.
A nice side-effect of switching Automake to "foreign" is that it
silences these warnings:
src/Makefile.am:563: warning: shell $(GLIB_COMPILE_RESOURCES:
non-POSIX variable name
src/Makefile.am:563: (probably a GNU make extension)
The loss of INSTALL, caused by "foreign", isn't a big problem because
the upcoming Meson port would have rendered it obsolete anyway. Users
can easily look up how to build a Autotools-based project.
ChangeLog | 4 ----
Makefile.am | 16 ----------------
configure.ac | 2 +-
3 files changed, 1 insertion(+), 21 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 906bf9f3..ec933515 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,6 @@ photosdoc_DATA = \
ARTISTS \
AUTHORS \
COPYING \
- ChangeLog \
NEWS \
README \
$(NULL)
@@ -30,7 +29,6 @@ MAINTAINERCLEANFILES = \
$(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \
$(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
$(srcdir)/AUTHORS \
- $(srcdir)/INSTALL \
$(srcdir)/config.h.in \
$(srcdir)/omf.make \
$(srcdir)/xmldocs.make \
@@ -54,20 +52,6 @@ AUTHORS:
echo Failed to generate $@ >&2 ); \
fi
-dist-hook:
- @if test -d "$(srcdir)/.git"; \
- then \
- echo Creating ChangeLog && \
- ( cd "$(top_srcdir)" && \
- echo '# Generated — do not edit.'; echo; \
- $(top_srcdir)/missing --run git log --stat ) > ChangeLog.tmp \
- && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
- || ( rm -f ChangeLog.tmp ; \
- echo Failed to generate ChangeLog >&2 ); \
- else \
- echo A git clone is required to generate a ChangeLog >&2; \
- fi
-
.PHONY: AUTHORS
-include $(top_srcdir)/git.mk
diff --git a/configure.ac b/configure.ac
index 4c2c3814..2d4eaf49 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ AC_CONFIG_SRCDIR([src])
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-AM_INIT_AUTOMAKE([dist-xz no-dist-gzip serial-tests tar-ustar])
+AM_INIT_AUTOMAKE([dist-xz foreign no-dist-gzip serial-tests tar-ustar])
AM_MAINTAINER_MODE([enable])
AX_IS_RELEASE([git-directory])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]