diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | i386/Makefrag.am | 10 |
3 files changed, 23 insertions, 11 deletions
@@ -1,3 +1,11 @@ +2007-12-10 Thomas Schwinge <tschwinge@gnu.org> + + * i386/Makefrag.am (i386/i386at/boothdr.o, i386/i386at/interrupt.o) + (i386/i386/cswitch.o, i386/i386/locore.o): Remove targets. + * configure.ac <Dependency tracking for `.S' files>: Add a hack to + re-add the four targets with have been removed above for the (legacy) + case only where they are actually needed. + 2007-12-05 Guillem Jover <guillem@hadrons.org> * i386/Makefrag.am (i386/i386at/interrupt.o): New target, depends on diff --git a/configure.ac b/configure.ac index 9a8c4ef..c387349 100644 --- a/configure.ac +++ b/configure.ac @@ -235,6 +235,9 @@ AC_CONFIG_COMMANDS_POST([ # Again, a real patch is being used here and not some `sed' magic, so that # it'll fail loudly in case some internals we're relying on are changed. # +# TODO. Remove this block as soon as we don't want to support such legacy +# versions of Automake anymore. +# AC_CONFIG_COMMANDS([frob_Makefile_for_correct_output_files_for_.S_files],[ # Do we have a version of Automake that doesn't have this bug? @@ -259,7 +262,7 @@ AC_CONFIG_COMMANDS([frob_Makefile_for_correct_output_files_for_.S_files],[ # -# Makefile.dependency_tracking_for_.S_files.patch +# Dependency tracking for `.S' files # # The used version of Automake might not support automatic dependency tracking # for (preprocessed) Assembler source files. We might add such support here. @@ -268,6 +271,9 @@ AC_CONFIG_COMMANDS([frob_Makefile_for_correct_output_files_for_.S_files],[ # we save the costs of adding such support here. You should instead consider # updating to Automake 1.10 or better. # +# TODO. Remove this block as soon as we don't want to support such legacy +# versions of Automake anymore. +# AC_CONFIG_COMMANDS([frob_Makefile_for_dependency_tracking_for_.S_files],[ # Do we have a version of Automake that doesn't have this bug? @@ -278,6 +284,14 @@ AC_CONFIG_COMMANDS([frob_Makefile_for_dependency_tracking_for_.S_files],[ AC_MSG_NOTICE([Your build of GNU Mach won't have dependency tracking for] [(preprocessed) Assembler source files. Consider updating to Automake] [1.10 or better if you need such support.]) + [# Make ``make -j'' parallel builds work at least. + cat >> Makefile <<"EOT" + +i386/i386at/boothdr.o: i386/i386/i386asm.h +i386/i386at/interrupt.o: i386/i386/i386asm.h +i386/i386/cswitch.o: i386/i386/i386asm.h +i386/i386/locore.o: i386/i386/i386asm.h +EOT] dnl In case someone feels like completing this instead of simply using a fixed dnl version of Automake... dnl if "$PATCH" -f; then :; else] diff --git a/i386/Makefrag.am b/i386/Makefrag.am index b5d3de9..bad0ce9 100644 --- a/i386/Makefrag.am +++ b/i386/Makefrag.am @@ -172,16 +172,6 @@ nodist_libkernel_a_SOURCES += \ i386/i386/mach_i386.server.c \ i386/i386/mach_i386.server.msgids # i386/i386/mach_i386.server.defs - -# -# Static dependencies. -# - -# TODO. Hm. -i386/i386at/boothdr.o: i386/i386/i386asm.h -i386/i386at/interrupt.o: i386/i386/i386asm.h -i386/i386/cswitch.o: i386/i386/i386asm.h -i386/i386/locore.o: i386/i386/i386asm.h EXTRA_DIST += \ i386/i386/i386asm.sym |