Honor --disable-dependency-tracking in libatomic

	PR other/55930
	* Makefile.am (M_DEPS): Honor -disable-dependency-tracking.
	* Makefile.in: Regenerated.

diff --git a/libatomic/ChangeLog b/libatomic/ChangeLog
index 4aeaadb189c5739845301e2bdb80910183630333..d38961409cd72187fbbecd32231a54495421cf17 100644 (file)
--- a/libatomic/ChangeLog
+++ b/libatomic/ChangeLog
@@ -1,3 +1,9 @@
+2020-02-22  Richard Purdie  <rpurdie@rpsys.net>
+
+       PR other/55930
+       * Makefile.am (M_DEPS): Honor -disable-dependency-tracking.
+       * Makefile.in: Regenerated.
+
 2020-01-24  Maciej W. Rozycki  <macro@wdc.com>
 
        * configure.ac: Handle `--with-toolexeclibdir='.

diff --git a/libatomic/Makefile.am b/libatomic/Makefile.am
index 61e449a340494fecfd473689e98cc0f418f24ba5..46a060a6267ff511ebdef53dc6ce3ca09a2bf632 100644 (file)
--- a/libatomic/Makefile.am
+++ b/libatomic/Makefile.am
@@ -101,7 +101,9 @@ PAT_S               = $(word 3,$(PAT_SPLIT))
 IFUNC_DEF      = -DIFUNC_ALT=$(PAT_S)
 IFUNC_OPT      = $(word $(PAT_S),$(IFUNC_OPTIONS))
 
-M_DEPS         = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo
+@AMDEP_TRUE@M_DEPS             = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo
+@AMDEP_TRUE@M_DEPS             =
+
 M_SIZE         = -DN=$(PAT_N)
 M_IFUNC                = $(if $(PAT_S),$(IFUNC_DEF) $(IFUNC_OPT))
 M_FILE         = $(PAT_BASE)_n.c

diff --git a/libatomic/Makefile.in b/libatomic/Makefile.in
index acf8839a919ab65c79546cf6a9aef152da68f044..935762e9dbdd668293d3392fd6e47da2cef91623 100644 (file)
--- a/libatomic/Makefile.in
+++ b/libatomic/Makefile.in
@@ -415,7 +415,8 @@ PAT_N = $(word 2,$(PAT_SPLIT))
 PAT_S = $(word 3,$(PAT_SPLIT))
 IFUNC_DEF = -DIFUNC_ALT=$(PAT_S)
 IFUNC_OPT = $(word $(PAT_S),$(IFUNC_OPTIONS))
-M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo
+@AMDEP_TRUE@M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo
+@AMDEP_FALSE@M_DEPS =
 M_SIZE = -DN=$(PAT_N)
 M_IFUNC = $(if $(PAT_S),$(IFUNC_DEF) $(IFUNC_OPT))
 M_FILE = $(PAT_BASE)_n.c