luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

autotools: stop generating a ChangeLog file for the dist tarball

Browse Source 
We have git for that.

automake requires a ChangLog file in gnu mode so switch to the less strict
foreign mode instead.
This commit is contained in:
Christoph Reiter 2018-09-04 17:43:37 +02:00
parent 912581340e
commit 24a95056b4
3 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -51,7 +51,6 @@ py-compile
test-driver
INSTALL
ChangeLog
/glib-lcov.info
/glib-lcov/

16
Makefile.am
View File

@ -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 \

2
configure.ac
View File

@ -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