diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.in | 3 | ||||
| -rw-r--r-- | Makerules.in | 25 | ||||
| -rw-r--r-- | i386/Makefile.in | 3 |
4 files changed, 17 insertions, 21 deletions
@@ -1,5 +1,12 @@ 2006-04-02 Thomas Schwinge <tschwinge@gnu.org> + * Makerules.in (%_user.c, %_server.c): Those are `.PRECIOUS'. + (%.migs.d, %.migu.d): New targets. + (%.migs_d, %.migu_d, %.migsh_d, %.miguh_d): Remove targets. + Adopt the `include's to the renamed targets. + * Makefile.in (clean): Adopt to the renamed targets. + * i386/Makefile.in (clean): Likewise. + * i386/Makefile.in (boothdr.o): New target. 2006-03-21 Thomas Schwinge <tschwinge@gnu.org> diff --git a/Makefile.in b/Makefile.in index 648317b..8322982 100644 --- a/Makefile.in +++ b/Makefile.in @@ -248,8 +248,7 @@ clean: rm -f clib-routines.o kernel.o kernel-undef kernel-undef-bad rm -f kernel kernel.gz kernel.stripped kernel.stripped.gz rm -f $(objfiles) $(subst .o,.d,$(objfiles)) - rm -f *.symc *.symc.o *_user.c *_server.c *.h - rm -f *.migs_d *.migsh_d *.migu_d *.miguh_d + rm -f *.symc *.symc.o *_user.c *_server.c *.h *.migs.d *.migu.d distclean: clean $(MAKE) -C $(systype) $@ diff --git a/Makerules.in b/Makerules.in index 60181ae..271cf7c 100644 --- a/Makerules.in +++ b/Makerules.in @@ -93,10 +93,12 @@ ASFLAGS += -DASSEMBLER sed -e 's/^[*]/#define/' -e 's/mAgIc[^-0-9]*//' >$@ # Building from foo.cli +.PRECIOUS: %_user.c %.h %_user.c: %.cli $(MIG) $(MIGFLAGS) -header $*.h -user $*_user.c -server /dev/null $< # Building from foo.srv +.PRECIOUS: %_server.c %_interface.h %_server.c: %.srv $(MIG) $(MIGFLAGS) -sheader $*_interface.h -server $*_server.c \ -header /dev/null -user /dev/null $< @@ -122,11 +124,8 @@ endif ifneq ($(no_deps),t) # For each file generated by MiG we need a .d file. --include $(subst _server.o,.migs_d,$(servers)) /dev/null --include $(subst _server.o,.migsh_d,$(servers)) /dev/null - --include $(subst _user.o,.migu_d,$(users)) /dev/null --include $(subst _user.o,.miguh_d,$(users)) /dev/null +-include $(subst _server.o,.migs.d,$(servers)) /dev/null +-include $(subst _user.o,.migu.d,$(users)) /dev/null # For each .o file we need a .d file. -include $(subst .o,.d,$(filter %.o,$(objfiles))) /dev/null @@ -134,20 +133,12 @@ ifneq ($(no_deps),t) endif # Here is how to make those dependency files - -%.migs_d: %.srv +%.migs.d: %.srv (set -e; $(CPP) $(MIGFLAGS) -M -MG -x c $< | \ - sed -e 's/[^:]*:/$(@:.migs_d=_server.c) $@:/' > $@) - -%.migu_d: %.cli + sed -e 's/[^:]*:/$*_server.c $*_interface.h $@:/' > $@) +%.migu.d: %.cli (set -e; $(CPP) $(MIGFLAGS) -M -MG -x c $< | \ - sed -e 's/[^:]*:/$(@:.migu_d=_user.c) $@:/' > $@) - -%.migsh_d: %.migs_d - sed -e 's/_server\.c /_interface.h /' -e 's/migs_d/migsh_d/' < $< > $@ - -%.miguh_d: %.migu_d - sed -e 's/_user\.c /.h /' -e 's/migu_d/miguh_d/' < $< > $@ + sed -e 's/[^:]*:/$*_user.c $*.h $@:/' > $@) # Generic rule for $(CC) based compilation for making dependencies define make-deps diff --git a/i386/Makefile.in b/i386/Makefile.in index 8a87dae..8214560 100644 --- a/i386/Makefile.in +++ b/i386/Makefile.in @@ -149,8 +149,7 @@ clean: $(MAKE) -C linux $@ rm -f sysdep.a rm -f $(objfiles) $(subst .o,.d,$(objfiles)) - rm -f *.symc *.symc.o *_user.c *_server.c *.h - rm -f *.migs_d *.migsh_d *.migu_d *.miguh_d + rm -f *.symc *.symc.o *_user.c *_server.c *.h *.migs.d *.migu.d distclean: clean $(MAKE) -C linux $@ |