diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | Makefrag.am | 37 | ||||
| -rw-r--r-- | Makerules.am | 54 | ||||
| -rw-r--r-- | i386/Makefrag.am | 3 |
4 files changed, 55 insertions, 48 deletions
@@ -1,3 +1,12 @@ +2007-03-23 Thomas Schwinge <tschwinge@gnu.org> + + * Makerules.am (%.server.msgids, %.user.msgids): Merge into the + existing ``%.h %.c'' rules. + Comment out the currently unused rpc stub rules. + * Makefrag.am (gnumach.msgids): Rewrite. + (nodist_libkernel_a_SOURCES): Add all ``.msgids'' files. + * i386/Makefrag.am (nodist_libkernel_a_SOURCES): Likewise. + 2007-03-19 Tim Retout <tim@retout.co.uk> * i386/ldscript: Correct 'LINKFLAGS_gnumach' in comment. diff --git a/Makefrag.am b/Makefrag.am index de37ab3..07853a6 100644 --- a/Makefrag.am +++ b/Makefrag.am @@ -430,8 +430,10 @@ nodist_lib_dep_tr_for_defs_a_SOURCES += \ nodist_libkernel_a_SOURCES += \ vm/memory_object_user.user.h \ vm/memory_object_user.user.c \ + vm/memory_object_user.user.msgids \ vm/memory_object_default.user.h \ - vm/memory_object_default.user.c + vm/memory_object_default.user.c \ + vm/memory_object_default.user.msgids # vm/memory_object_user.user.defs # vm/memory_object_default.user.defs nodist_lib_dep_tr_for_defs_a_SOURCES += \ @@ -440,8 +442,10 @@ nodist_lib_dep_tr_for_defs_a_SOURCES += \ nodist_libkernel_a_SOURCES += \ device/device_reply.user.h \ device/device_reply.user.c \ + device/device_reply.user.msgids \ device/memory_object_reply.user.h \ - device/memory_object_reply.user.c + device/memory_object_reply.user.c \ + device/memory_object_reply.user.msgids # device/device_reply.user.defs # device/memory_object_reply.user.defs @@ -452,15 +456,18 @@ nodist_lib_dep_tr_for_defs_a_SOURCES += \ nodist_libkernel_a_SOURCES += \ device/device.server.h \ device/device.server.c \ + device/device.server.msgids \ device/device_pager.server.h \ - device/device_pager.server.c + device/device_pager.server.c \ + device/device_pager.server.msgids # device/device.server.defs # device/device_pager.server.defs nodist_lib_dep_tr_for_defs_a_SOURCES += \ ipc/mach_port.server.defs.c nodist_libkernel_a_SOURCES += \ ipc/mach_port.server.h \ - ipc/mach_port.server.c + ipc/mach_port.server.c \ + ipc/mach_port.server.msgids # ipc/mach_port.server.defs nodist_lib_dep_tr_for_defs_a_SOURCES += \ kern/mach.server.defs.c \ @@ -470,12 +477,16 @@ nodist_lib_dep_tr_for_defs_a_SOURCES += \ nodist_libkernel_a_SOURCES += \ kern/mach.server.h \ kern/mach.server.c \ + kern/mach.server.msgids \ kern/mach4.server.h \ kern/mach4.server.c \ + kern/mach4.server.msgids \ kern/mach_debug.server.h \ kern/mach_debug.server.c \ + kern/mach_debug.server.msgids \ kern/mach_host.server.h \ - kern/mach_host.server.c + kern/mach_host.server.c \ + kern/mach_host.server.msgids # kern/mach.server.defs # kern/mach4.server.defs # kern/mach_debug.server.defs @@ -484,19 +495,9 @@ nodist_libkernel_a_SOURCES += \ # rpctrace can make use of that. MOSTLYCLEANFILES += \ gnumach.msgids -gnumach.msgids: $(nodist_lib_dep_tr_for_defs_a_SOURCES) - rm -f $@ - for f in $(nodist_lib_dep_tr_for_defs_a_SOURCES); do \ - f=`expr "$$f" : '\(.*\)\.defs\.c'`.msgids && \ - $(MAKE) $(AM_MAKEFLAGS) "$$f" && \ - cat "$$f" >> $@; \ - r=$$?; \ - rm -f "$$f"; \ - if ( exit "$$r" ); then :; else \ - rm -vf $@; \ - exit "$$r"; \ - fi; \ - done +gnumach.msgids: $(filter %.msgids,$(nodist_libkernel_a_SOURCES)) + cat $^ > $@.new + mv $@.new $@ # `exec_' prefix, so that we don't try to build that file during when running # `make install-data', as it may fail there, but isn't needed there either. exec_msgidsdir = $(datadir)/msgids diff --git a/Makerules.am b/Makerules.am index 05e7448..18d5820 100644 --- a/Makerules.am +++ b/Makerules.am @@ -1,6 +1,6 @@ # Makerules: how to do some things. -# Copyright 2006 Free Software Foundation, Inc. +# Copyright (C) 2006, 2007 Free Software Foundation, Inc. # Permission to use, copy, modify and distribute this software and its # documentation is hereby granted, provided that both the copyright @@ -38,7 +38,7 @@ EXTRA_DIST += \ # 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 six rules and the lib_dep_tr_for_defs.a +# TODO. Get rid of the following four rules and the lib_dep_tr_for_defs.a # machinery (see Makefrag.am and i386/Makefrag.am). %.server.defs.c: %.srv rm -f $@ @@ -46,43 +46,39 @@ EXTRA_DIST += \ %.user.defs.c: %.cli rm -f $@ cp -p $< $@ -%.server.h %.server.c: lib_dep_tr_for_defs_a-%.server.defs.$(OBJEXT) +%.server.h %.server.c %.server.msgids: lib_dep_tr_for_defs_a-%.server.defs.$(OBJEXT) $(MIGCOM) $(MIGCOMFLAGS) $(MIGCOMSFLAGS) \ -sheader $*.server.h -server $*.server.c \ -user /dev/null -header /dev/null \ + -list $*.server.msgids \ < $< -%.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) +%.user.h %.user.c %.user.msgids: lib_dep_tr_for_defs_a-%.user.defs.$(OBJEXT) $(MIGCOM) $(MIGCOMFLAGS) $(MIGCOMUFLAGS) \ -user $*.user.c -server /dev/null -header $*.user.h \ - < $< -%.user.msgids: lib_dep_tr_for_defs_a-%.user.defs.$(OBJEXT) - $(MIGCOM) $(MIGCOMFLAGS) $(MIGCOMUFLAGS) \ - -n -list $@ \ + -list $*.user.msgids \ < $< # TODO. Get rid of the .srv files and rather use .defs files and MIG*SFLAGS? -%.server.defs: %.srv - $(CPP) $(AM_CPPFLAGS) $(CPPFLAGS) -o $@ $< -%.server.defs: %.defs - $(CPP) $(AM_CPPFLAGS) $(CPPFLAGS) $(MIGSFLAGS) -o $@ $< -%.server.h %.server.c: %.server.defs - $(MIGCOM) $(MIGCOMFLAGS) $(MIGCOMSFLAGS) \ - -sheader $*.server.h -server $*.server.c \ - -user /dev/null -header /dev/null \ - < $< +#%.server.defs: %.srv +# $(CPP) $(AM_CPPFLAGS) $(CPPFLAGS) -o $@ $< +#%.server.defs: %.defs +# $(CPP) $(AM_CPPFLAGS) $(CPPFLAGS) $(MIGSFLAGS) -o $@ $< +#%.server.h %.server.c %.server.msgids: %.server.defs +# $(MIGCOM) $(MIGCOMFLAGS) $(MIGCOMSFLAGS) \ +# -sheader $*.server.h -server $*.server.c \ +# -user /dev/null -header /dev/null \ +# -list $*.server.msgids \ +# < $< # TODO. Get rid of the .cli files and rather use .defs files and MIG*UFLAGS? -%.user.defs: %.cli - $(CPP) $(AM_CPPFLAGS) $(CPPFLAGS) -o $@ $< -%.user.defs: %.defs - $(CPP) $(AM_CPPFLAGS) $(CPPFLAGS) $(MIGUFLAGS) -o $@ $< -%.user.h %.user.c: %.user.defs - $(MIGCOM) $(MIGCOMFLAGS) $(MIGCOMUFLAGS) \ - -user $*.user.c -server /dev/null -header $*.user.h \ - < $< +#%.user.defs: %.cli +# $(CPP) $(AM_CPPFLAGS) $(CPPFLAGS) -o $@ $< +#%.user.defs: %.defs +# $(CPP) $(AM_CPPFLAGS) $(CPPFLAGS) $(MIGUFLAGS) -o $@ $< +#%.user.h %.user.c %.user.msgids: %.user.defs +# $(MIGCOM) $(MIGCOMFLAGS) $(MIGCOMUFLAGS) \ +# -user $*.user.c -server /dev/null -header $*.user.h \ +# -list $*.user.msgids \ +# < $< # # gzip files. diff --git a/i386/Makefrag.am b/i386/Makefrag.am index 7d573db..d90ab63 100644 --- a/i386/Makefrag.am +++ b/i386/Makefrag.am @@ -173,7 +173,8 @@ nodist_lib_dep_tr_for_defs_a_SOURCES += \ i386/i386/mach_i386.server.defs.c nodist_libkernel_a_SOURCES += \ i386/i386/mach_i386.server.h \ - i386/i386/mach_i386.server.c + i386/i386/mach_i386.server.c \ + i386/i386/mach_i386.server.msgids # i386/i386/mach_i386.server.defs # |