[glib/remove-changelogs: 27/27] autotools: stop generating a ChangeLog file for the dist tarball
- From: Christoph Reiter <creiter src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/remove-changelogs: 27/27] autotools: stop generating a ChangeLog file for the dist tarball
- Date: Wed, 12 Sep 2018 11:55:49 +0000 (UTC)
commit 24a95056b4c5a957754f83c696040268965a1e8d
Author: Christoph Reiter <creiter src gnome org>
Date: Tue Sep 4 17:43:37 2018 +0200
autotools: stop generating a ChangeLog file for the dist tarball
We have git for that.
automake requires a ChangLog file in gnu mode so switch to the less strict
foreign mode instead.
.gitignore | 1 -
Makefile.am | 16 +---------------
configure.ac | 2 +-
3 files changed, 2 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0caa0c05d..111db82e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,7 +51,6 @@ py-compile
test-driver
INSTALL
-ChangeLog
/glib-lcov.info
/glib-lcov/
diff --git a/Makefile.am b/Makefile.am
index 96f1fd516..0101c3d50 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -99,24 +99,10 @@ EXTRA_DIST += $(meson_build_files)
# These may be in the builddir too
BUILT_EXTRA_DIST += \
INSTALL \
- ChangeLog \
$(NULL)
CONFIGURE_DEPENDENCIES = acglib.m4
-ChangeLog:
- $(AM_V_GEN) if test -d "$(srcdir)/.git"; then \
- (GIT_DIR=$(top_srcdir)/.git ./missing --run git log GLIB_2_20_0^^.. --stat) | fmt --split-only >
$@.tmp \
- && mv -f $@.tmp $@ \
- || ($(RM) $@.tmp; \
- echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
- (test -f $@ || echo git-log is required to generate this file >> $@)); \
- else \
- test -f $@ || \
- (echo A git checkout and git-log is required to generate ChangeLog >&2 && \
- echo A git checkout and git-log is required to generate this file >> $@); \
- fi
-
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = glib-2.0.pc gobject-2.0.pc gmodule-2.0.pc gmodule-export-2.0.pc gmodule-no-export-2.0.pc
gthread-2.0.pc gio-2.0.pc
@@ -144,7 +130,7 @@ distclean-local: lcov-clean
rm -f $(BUILT_EXTRA_DIST); \
fi
-.PHONY: files release sanity snapshot ChangeLog
+.PHONY: files release sanity snapshot
files:
@files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
diff --git a/configure.ac b/configure.ac
index 38564e790..213e3c083 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,7 +63,7 @@ AC_CONFIG_MACRO_DIR([m4macros])
# Save this value here, since automake will set cflags later
cflags_set=${CFLAGS:+set}
-AM_INIT_AUTOMAKE([1.13.3 -Wno-portability no-define no-dist-gzip dist-xz tar-ustar subdir-objects])
+AM_INIT_AUTOMAKE([1.13.3 -Wno-portability no-define no-dist-gzip dist-xz tar-ustar subdir-objects foreign])
AM_MAINTAINER_MODE([enable])
# Support silent build rules. Disable
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]