mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-15 20:45:32 +00:00
Revert "build: only update config-extra.h if it changes"
Not touching "config-extra.h" means that the target is rebuild every
time (because the timestampt does not get updated). On the other hand,
touching it will cause a full rebuild (which we often want to avoid).
The right solution is instead to depend on "config.h", which will be
done next.
This reverts commit 14271d84a0
.
This commit is contained in:
parent
57431d872c
commit
7ed1fc817f
38
Makefile.am
38
Makefile.am
|
@ -111,25 +111,25 @@ dflt_cppflags = -std=gnu11
|
||||||
# With meson-only, they could just be set via config.h.meson
|
# With meson-only, they could just be set via config.h.meson
|
||||||
config-extra.h: Makefile
|
config-extra.h: Makefile
|
||||||
$(AM_V_GEN) \
|
$(AM_V_GEN) \
|
||||||
echo "/* Generated by Makefile.am */" >$@.tmp && \
|
echo "/* Generated by Makefile.am */" >$@ && \
|
||||||
echo "#define BINDIR \"$(bindir)\"" >>$@.tmp && \
|
echo "#define BINDIR \"$(bindir)\"" >>$@ && \
|
||||||
echo "#define DATADIR \"$(datadir)\"" >>$@.tmp && \
|
echo "#define DATADIR \"$(datadir)\"" >>$@ && \
|
||||||
echo "#define LIBEXECDIR \"$(libexecdir)\"" >>$@.tmp && \
|
echo "#define LIBEXECDIR \"$(libexecdir)\"" >>$@ && \
|
||||||
echo "#define LOCALSTATEDIR \"$(localstatedir)\"" >>$@.tmp && \
|
echo "#define LOCALSTATEDIR \"$(localstatedir)\"" >>$@ && \
|
||||||
echo "#define NMCONFDIR \"$(nmconfdir)\"" >>$@.tmp && \
|
echo "#define NMCONFDIR \"$(nmconfdir)\"" >>$@ && \
|
||||||
echo "#define NMLIBDIR \"$(nmlibdir)\"" >>$@.tmp && \
|
echo "#define NMLIBDIR \"$(nmlibdir)\"" >>$@ && \
|
||||||
echo "#define NMLOCALEDIR \"$(nmlocaledir)\"" >>$@.tmp && \
|
echo "#define NMLOCALEDIR \"$(nmlocaledir)\"" >>$@ && \
|
||||||
echo "#define NMPLUGINDIR \"$(plugindir)\"" >>$@.tmp && \
|
echo "#define NMPLUGINDIR \"$(plugindir)\"" >>$@ && \
|
||||||
echo "#define NMRUNDIR \"$(nmrundir)\"" >>$@.tmp && \
|
echo "#define NMRUNDIR \"$(nmrundir)\"" >>$@ && \
|
||||||
echo "#define NMSTATEDIR \"$(nmstatedir)\"" >>$@.tmp && \
|
echo "#define NMSTATEDIR \"$(nmstatedir)\"" >>$@ && \
|
||||||
echo "#define NMVPNDIR \"$(pkglibdir)\"" >>$@.tmp && \
|
echo "#define NMVPNDIR \"$(pkglibdir)\"" >>$@ && \
|
||||||
echo "#define NM_BUILD_BUILDDIR \"$(abs_builddir)\"" >>$@.tmp && \
|
echo "#define NM_BUILD_BUILDDIR \"$(abs_builddir)\"" >>$@ && \
|
||||||
echo "#define NM_BUILD_SRCDIR \"$(abs_srcdir)\"" >>$@.tmp && \
|
echo "#define NM_BUILD_SRCDIR \"$(abs_srcdir)\"" >>$@ && \
|
||||||
echo "#define PPPD_PLUGIN_DIR \"$(PPPD_PLUGIN_DIR)\"" >>$@.tmp && \
|
echo "#define PPPD_PLUGIN_DIR \"$(PPPD_PLUGIN_DIR)\"" >>$@ && \
|
||||||
echo "#define PREFIX \"$(prefix)\"" >>$@.tmp && \
|
echo "#define PREFIX \"$(prefix)\"" >>$@ && \
|
||||||
echo "#define RUNSTATEDIR \"$(runstatedir)\"" >>$@.tmp && \
|
echo "#define RUNSTATEDIR \"$(runstatedir)\"" >>$@ && \
|
||||||
echo "#define SYSCONFDIR \"$(sysconfdir)\"" >>$@.tmp && \
|
echo "#define SYSCONFDIR \"$(sysconfdir)\"" >>$@ && \
|
||||||
if cmp $@ $@.tmp; then rm $@.tmp; else mv $@.tmp $@; fi
|
true
|
||||||
|
|
||||||
DISTCLEANFILES += config-extra.h
|
DISTCLEANFILES += config-extra.h
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue