summaryrefslogtreecommitdiff
path: root/Makerules
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2006-01-17 04:31:22 +0000
committerRoland McGrath <roland@gnu.org>2006-01-17 04:31:22 +0000
commitf0cf0902eab6ed0e1784823c92a358029f7c7b17 (patch)
tree402a18c84ea769ca8c518cd290467f42dece7dd3 /Makerules
parentedbaf668f6d6588fcf1d7a931fdd9e19a5999f6d (diff)
* Makerules ($(+sysdir_pfx)sysd-rules): Emit pattern rules to install
into $(inst_includedir)/%.h from sysdirs. [headers]: Change static pattern rule for installing $(headers) to do only those not matching %.h. ($(inst_includedir)/%.h: $(objpfx)%.h): Add this pattern rule instead. ($(inst_includedir)/%.h: %.h): Likewise. ($(inst_includedir)/%.h: $(..)include/%.h): Likewise. * Makefile ($(inst_includedir)/gnu/stubs.h): Add $(make-target-directory). * stdlib/Makefile (headers): Restore headers removed in last change. 2006-01-16 Jakub Jelinek <jakub@redhat.com> * math/e_exp2l.c: Don't include stdio.h, errno.h, stub-tag.h, include math_private.h. (__ieee754_exp2l): Compute for now as expl (M_LN2l * x) instead of failing. (exp2l): Remove stub_warning. 2006-01-15 Jakub Jelinek <jakub@redhat.com> * io/tst-faccessat.c (do_test): Don't fail if geteuid () == 0.
Diffstat (limited to 'Makerules')
-rw-r--r--Makerules22
1 files changed, 16 insertions, 6 deletions
diff --git a/Makerules b/Makerules
index 027beef31b..e376dabae1 100644
--- a/Makerules
+++ b/Makerules
@@ -267,6 +267,8 @@ $(+sysdir_pfx)sysd-rules: $(+sysdir_pfx)config.make $(..)Makerules \
done; \
echo "\$$(objpfx)m_%.S: $$dir/s_%.S; \$$(+make-include-of-dep)"; \
echo "\$$(objpfx)m_%.c: $$dir/s_%.c; \$$(+make-include-of-dep)"; \
+ echo "\$$(inst_includedir)/%.h: $$dir/%.h \$$(+force); \
+ \$$(do-install)"; \
done; \
echo "\$$(objpfx)m_%.c: s_%.c; \$$(+make-include-of-dep)"; \
echo 'sysd-rules-done = t') > $@T
@@ -283,11 +285,6 @@ echo '#include <$<>' > $@T
mv -f $@T $@
endef
-# It matters that this set of rules, for compiling from sources in
-# the current directory (the $srcdir/$subdir) come before the
-# generated sysdep rules in included from sysd-rules below. When
-# compiling in the source tree, generated sources go into the current
-# directory, and those should be chosen before any sources in sysdeps.
define o-iterator-doit
$(objpfx)%$o: %.S $(before-compile); $$(compile-command.S)
endef
@@ -1126,8 +1123,21 @@ $(addprefix $(inst_datadir)/,$(install-data)): $(inst_datadir)/%: % $(+force)
endif
headers := $(strip $(headers))
ifdef headers
-$(addprefix $(inst_includedir)/,$(headers)): $(inst_includedir)/%: % $(+force)
+# This implicit rule installs headers from the source directory.
+# It may be ignored in preference to rules from sysd-rules to find
+# headers in the sysdeps tree.
+$(inst_includedir)/%.h: $(objpfx)%.h $(+force)
$(do-install)
+$(inst_includedir)/%.h: %.h $(+force)
+ $(do-install)
+$(inst_includedir)/%.h: $(..)include/%.h $(+force)
+ $(do-install)
+headers-nonh := $(filter-out %.h,$(headers))
+ifdef headers-nonh
+$(addprefix $(inst_includedir)/,$(headers-nonh)): $(inst_includedir)/%: \
+ % $(+force)
+ $(do-install)
+endif # headers-nonh
endif # headers
.PHONY: install-bin-nosubdir install-bin-script-nosubdir \