summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Schwinge <tschwinge@gnu.org>2006-10-26 17:19:20 +0000
committerThomas Schwinge <tschwinge@gnu.org>2009-06-18 00:26:49 +0200
commit600380d987bc1f30d592cb4311172fcd910f8e18 (patch)
treed9293aca1e15d3ddb821b4d7b3b4017e89788789
parent4f01943b115c18ae0ee5fd1934ad7071885d3b00 (diff)
2006-10-26 Thomas Schwinge <tschwinge@gnu.org>
* Makefile.in: Regenerate.
-rw-r--r--ChangeLog3
-rw-r--r--Makefile.in16
2 files changed, 11 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 9d843db..e0a91a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,13 @@
2006-10-26 Thomas Schwinge <tschwinge@gnu.org>
+ * Makefile.in: Regenerate.
+
[task #5956 --- ``Automake'ify GNU Mach's code base'']
* Makefrag.am (gnumach.msgids): Remove repetition.
* Makerules.am (%.server.msgids, %.user.msgids): Targets renamed from
`%.msgids'. Also consider MIGCOMSFLAGS respective MIGCOMUFLAGS.
+ Thanks to Guillem Jover and Leonardo Lopes Pereira for reporting this.
The Automake build system wants us to have these files in the rcs, so
do that.
diff --git a/Makefile.in b/Makefile.in
index a649ef8..f9cd6a7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -6647,7 +6647,7 @@ uninstall-info: uninstall-info-recursive
# convenient to be able to explicitly make the intermediate files when you want
# to deal with a problem in the MIG stub generator.
-# TODO. Get rid of the following four rules and the lib_dep_tr_for_defs.a
+# TODO. Get rid of the following six rules and the lib_dep_tr_for_defs.a
# machinery (see Makefrag.am and i386/Makefrag.am).
%.server.defs.c: %.srv
rm -f $@
@@ -6660,17 +6660,17 @@ uninstall-info: uninstall-info-recursive
-sheader $*.server.h -server $*.server.c \
-user /dev/null -header /dev/null \
< $<
-%.msgids: lib_dep_tr_for_defs_a-%.server.defs.$(OBJEXT)
- $(MIGCOM) $(MIGCOMFLAGS) \
- -n -list $@ \
+%.server.msgids: lib_dep_tr_for_defs_a-%.server.defs.$(OBJEXT)
+ $(MIGCOM) $(MIGCOMFLAGS) $(MIGCOMSFLAGS) \
+ -n -list $@ \
< $<
%.user.h %.user.c: lib_dep_tr_for_defs_a-%.user.defs.$(OBJEXT)
$(MIGCOM) $(MIGCOMFLAGS) $(MIGCOMUFLAGS) \
-user $*.user.c -server /dev/null -header $*.user.h \
< $<
-%.msgids: lib_dep_tr_for_defs_a-%.user.defs.$(OBJEXT)
- $(MIGCOM) $(MIGCOMFLAGS) \
- -n -list $@ \
+%.user.msgids: lib_dep_tr_for_defs_a-%.user.defs.$(OBJEXT)
+ $(MIGCOM) $(MIGCOMFLAGS) $(MIGCOMUFLAGS) \
+ -n -list $@ \
< $<
# TODO. Get rid of the .srv files and rather use .defs files and MIG*SFLAGS?
@@ -6728,7 +6728,7 @@ install-data-hook:
rm -f '$(DESTDIR)$(include_machdir)'/machine
ln -s '$(systype)' '$(DESTDIR)$(include_machdir)'/machine
gnumach.msgids: $(nodist_lib_dep_tr_for_defs_a_SOURCES)
- rm -f gnumach.msgids
+ rm -f $@
for f in $(nodist_lib_dep_tr_for_defs_a_SOURCES); do \
f=`expr "$$f" : '\(.*\)\.defs\.c'`.msgids && \
$(MAKE) $(AM_MAKEFLAGS) "$$f" && \