From 51aa453ff7b06f015cd169eb88b1f094bef1ea60 Mon Sep 17 00:00:00 2001
From: "briano%netscape.com"
 <briano%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 9 Sep 1999 03:51:17 +0000
Subject: [PATCH] General cleanup.

git-svn-id: svn://10.0.0.236/trunk@46498 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/nav-java/Makefile.in       |  7 ++--
 mozilla/nav-java/stubs/Makefile.in |  9 +++--
 mozilla/sun-java/Makefile.in       | 59 ++++++++++++++----------------
 3 files changed, 36 insertions(+), 39 deletions(-)

diff --git a/mozilla/nav-java/Makefile.in b/mozilla/nav-java/Makefile.in
index 545c21ac352..c4bf96660ff 100644
--- a/mozilla/nav-java/Makefile.in
+++ b/mozilla/nav-java/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
@@ -14,17 +13,19 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
+
 DIRS		= $(AWT11DIRS) classes netscape
 
 ifndef MOZ_JAVA
-DIRS=stubs
+DIRS		= stubs
 endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/nav-java/stubs/Makefile.in b/mozilla/nav-java/stubs/Makefile.in
index 9ee28dbd37f..649bc4bf532 100644
--- a/mozilla/nav-java/stubs/Makefile.in
+++ b/mozilla/nav-java/stubs/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
@@ -14,14 +13,16 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-DEPTH = ../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS  = jri include src
+DIRS		= jri include src
 
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/sun-java/Makefile.in b/mozilla/sun-java/Makefile.in
index c19b55e1cf4..13d2a9a6f25 100644
--- a/mozilla/sun-java/Makefile.in
+++ b/mozilla/sun-java/Makefile.in
@@ -1,4 +1,3 @@
-#!gmake
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
@@ -14,60 +13,56 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= md-include $(AWT11DIRS) classsrc javah jtools include \
-		  runtime md awt mmedia netscape jpegwrap zipwrap bn jdbc
+DIRS		= stubs
+
+OTHER_DIRS	= javac javadoc doc javap
 
-#
-# We need to build only console for stand alone java
-#
 ifdef MOZ_JAVA
-
 ifeq ($(STAND_ALONE_JAVA),1)
 DIRS		= javah $(AWT11DIRS) classsrc include md-include md \
 		  runtime awt mmedia jpegwrap zipwrap bn jdbc netscape/console
+else
+DIRS		= md-include $(AWT11DIRS) classsrc javah jtools include \
+		  runtime md awt mmedia netscape jpegwrap zipwrap bn jdbc
 endif
 ifeq ($(AWT_11),1)
 AWT11DIRS	= classsrc11
 endif
-
-else  # MOZ_JAVA
-DIRS = stubs
-endif # MOZ_JAVA
-
-include $(topsrcdir)/config/rules.mk
-
-OTHER_DIRS	= javac javadoc doc javap
+endif
 
 LOOP_OVER_OTHER_DIRS =						\
-	@for d in $(OTHER_DIRS); do				\
-		if test -d $$d; then				\
-			set -e;					\
-			echo "cd $$d; $(MAKE) $@";		\
-			cd $$d; $(MAKE) $@; cd ..;		\
-			set +e;					\
-		else						\
-			echo "Skipping non-directory $$d...";	\
-		fi;						\
+	@for d in $(OTHER_DIRS); do \
+		if test -d $$d; then \
+			set -e; \
+			echo "cd $$d; $(MAKE) $@"; \
+			cd $$d; $(MAKE) $@; cd ..; \
+			set +e; \
+		else \
+			echo "Skipping non-directory $$d..."; \
+		fi; \
 	done
 
+include $(topsrcdir)/config/rules.mk
+
 .PHONY: $(OTHER_DIRS)
 
 $(OTHER_DIRS)::
-	@if test -d $@; then				\
-		set -e;					\
-		echo "cd $@; $(MAKE)";			\
-		cd $@; $(MAKE);				\
-		set +e;					\
-	else						\
-		echo "Skipping non-directory $@...";	\
+	@if test -d $@; then \
+		set -e; \
+		echo "cd $@; $(MAKE)"; \
+		cd $@; $(MAKE); \
+		set +e; \
+	else \
+		echo "Skipping non-directory $@..."; \
 	fi
 
 other_dirs::