Mon Apr 26 02:13:02 1999 Thomas Bushnell, BSG <tb@mit.edu>

	* Makefile.in (objfiles): Don't add $(systype)/sysdep.o here.
	($(systype)/sysdep.o): Delete rule.
	(clean, distclean, mostlyclean, maintainerclean, install-headers,
	install-kernel): Don't do recursive make here.
	* i386/Makefrag (objfiles): Add i386/sysdep.o to the list.
	(i386/sysdep.o): New rule.
	(clean): Depend on i386-clean.
	(distclean): Depend on i386-distclean.
	(mostlyclean): Depend on i386-mostlyclean.
	(maintainerclean): Depend on i386-maintainerclean.
	(install-headers): Depend on i386-install-headers.
	(install-kernel): Depend on i386-install-kernel.
	(i386-clean, i386-distclean, i386-mostlyclean,
	i386-maintainerclean, i386-install-kernel, i386-install-headers):
	New rules.

3 files changed, 53 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 392359e..a176239 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+Mon Apr 26 02:13:02 1999  Thomas Bushnell, BSG  <tb@mit.edu>
+
+	* Makefile.in (objfiles): Don't add $(systype)/sysdep.o here.
+	($(systype)/sysdep.o): Delete rule.
+	(clean, distclean, mostlyclean, maintainerclean, install-headers,
+	install-kernel): Don't do recursive make here.
+	* i386/Makefrag (objfiles): Add i386/sysdep.o to the list.
+	(i386/sysdep.o): New rule.
+	(clean): Depend on i386-clean.
+	(distclean): Depend on i386-distclean.
+	(mostlyclean): Depend on i386-mostlyclean.
+	(maintainerclean): Depend on i386-maintainerclean.
+	(install-headers): Depend on i386-install-headers.
+	(install-kernel): Depend on i386-install-kernel.
+	(i386-clean, i386-distclean, i386-mostlyclean,
+	i386-maintainerclean, i386-install-kernel, i386-install-headers):
+	New rules.
+	
 1999-04-14  OKUJI Yoshinori  <okuji@kuicr.kyoto-u.ac.jp>
 
 	* version.c (version): Update to 1.1.92.
diff --git a/Makefile.in b/Makefile.in
index f74a8ed..45c5d36 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -304,10 +304,6 @@ INCLUDES += -I. -I$(srcdir) -I$(srcdir)/include \
 
 include $(sysdep)/Makefrag
 
-objfiles += $(systype)/sysdep.o
-$(systype)/sysdep.o: $(systype)
-	cd $(systype) && $(MAKE) all
-
 CPPFLAGS += -nostdinc $(DEFINES) $(INCLUDES)
 
 MIGFLAGS += $(CPPFLAGS)
@@ -318,20 +314,16 @@ MIGFLAGS += $(CPPFLAGS)
 all: kernel
 
 clean:
-	cd $(systype) && $(MAKE) clean
 	rm -f *.o *.d kernel
 	rm -f *.symc *.symc.o *_user.c *_server.c *.h
 	rm -f *.migs_d *.migsh_d *.migu_d *.miguh_d
 
 distclean: clean
-	cd $(systype) && $(MAKE) distclean
 	rm -f config.status config.cache config.log Makefile driverlist
 
 mostlyclean: distclean
-	cd $(systype) && $(MAKE) mostlyclean
 
 maintainer-clean: mostlyclean
-	cd $(systype) && $(MAKE) maintainer-clean
 	rm -f $(srcdir)/configure $(all-archs-configures)
 
 check:
@@ -362,14 +354,10 @@ $(installed-sysdep-headers-names): $(includedir)/%: $(sysdep)/include/%
 
 install-headers: mkheaderdirs $(installed-headers-names) $(installed-sysdep-headers-names)
 	ln -sf $(systype) $(includedir)/mach/machine
-	cd $(systype) && $(MAKE) install-headers
 
 install-kernel: kernel mkkerneldirs
 	$(INSTALL_PROGRAM) kernel $(bootdir)/gnumach
-	cd $(systype) && $(MAKE) install-kernel
 
-# Note: The `-p' option to mkdir is not compliant with
-# the GNU Coding Standards. -- okuji
 mkheaderdirs:
 	mkdir -p $(includedir) $(includedir)/device $(includedir)/mach \
 		$(includedir)/mach/$(systype) $(includedir)/mach/exec
diff --git a/i386/Makefrag b/i386/Makefrag
index 8336b01..38e7632 100644
--- a/i386/Makefrag
+++ b/i386/Makefrag
@@ -59,6 +59,33 @@ ifeq ($(findstring -DMACH_LPR,@DEFS@),-DMACH_LPR)
 objfiles += lpr.o
 endif
 
+# We link the device drivers together into this file in a separate Make
+# run, because the Linux-related code sometimes re-uses filenames.  Arrange
+# to have that Makefile used to generate and clean and otherwise deal with 
+# those filenames.
+
+objfiles += i386/sysdep.o
+i386/sysdep.o: $(systype)
+	cd i386 && $(MAKE) all
+
+clean: i386-clean
+i386-clean:
+	cd i386 && $(MAKE) clean
+
+distclean: i386-distclean
+i386-distclean:
+	cd i386 && $(MAKE) distclean
+
+mostlyclean: i386-mostlyclean
+i386-mostlyclean:
+	cd i386 && $(MAKE) mostlyclean
+
+maintainerclean: i386-maintainerclean
+i386-maitainerclean:
+	cd i386 && $(MAKE) maintainer-clean
+
+
+
 
 
 # Where to find some things
@@ -85,6 +112,14 @@ boothdr.o: i386asm.h
 
 # Header files we install
 
+install-headers: i386-install-headers
+i386-install-headers:
+	cd i386 && $(MAKE) install-headers
+
+install-kernel: i386-install-kernel
+i386-install-kernel:
+	cd $(systype) && $(MAKE) install-kernel
+
 # We have our own version of this file
 installed-headers := $(filter-out mach/proc_ops.h,$(installed-headers))