summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Schwinge <tschwinge@gnu.org>2006-10-26 17:15:50 +0000
committerThomas Schwinge <tschwinge@gnu.org>2009-06-18 00:26:49 +0200
commit4f01943b115c18ae0ee5fd1934ad7071885d3b00 (patch)
tree7afac470e5e05e1b748f8a9595b4e9bcf19b519a
parentc8f769a96a8419ec24c1ba222caab6488eb55f29 (diff)
2006-10-26 Thomas Schwinge <tschwinge@gnu.org>
[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.
-rw-r--r--ChangeLog5
-rw-r--r--Makefrag.am2
-rw-r--r--Makerules.am14
3 files changed, 13 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index d3e4ef2..9d843db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
2006-10-26 Thomas Schwinge <tschwinge@gnu.org>
[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.
+
The Automake build system wants us to have these files in the rcs, so
do that.
* doc/mach.info: New file, generated.
diff --git a/Makefrag.am b/Makefrag.am
index 652e324..3000559 100644
--- a/Makefrag.am
+++ b/Makefrag.am
@@ -324,7 +324,7 @@ nodist_libkernel_a_SOURCES += \
MOSTLYCLEANFILES += \
gnumach.msgids
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" && \
diff --git a/Makerules.am b/Makerules.am
index f571043..ac214b5 100644
--- a/Makerules.am
+++ b/Makerules.am
@@ -36,7 +36,7 @@
# 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 $@
@@ -49,17 +49,17 @@
-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?