From 4662b521e9b4a3c96571287ae331b0c32198ef04 Mon Sep 17 00:00:00 2001
From: "briano%netscape.com"
 <briano%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 15 Sep 1999 22:29:43 +0000
Subject: [PATCH] General cleanup.

git-svn-id: svn://10.0.0.236/trunk@47672 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/sun-java/Makefile.in               | 40 ++++++++++++++-----
 mozilla/sun-java/stubs/Makefile.in         |  6 ++-
 mozilla/sun-java/stubs/include/Makefile.in | 45 ++++++++++++----------
 mozilla/sun-java/stubs/jri/Makefile.in     |  6 ++-
 mozilla/sun-java/stubs/src/Makefile.in     |  8 ++--
 5 files changed, 66 insertions(+), 39 deletions(-)

diff --git a/mozilla/sun-java/Makefile.in b/mozilla/sun-java/Makefile.in
index 13d2a9a6f25..df388f83800 100644
--- a/mozilla/sun-java/Makefile.in
+++ b/mozilla/sun-java/Makefile.in
@@ -22,24 +22,43 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+ifndef MOZ_JAVA
 DIRS		= stubs
-
-OTHER_DIRS	= javac javadoc doc javap
-
-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
+DIRS		= \
+		md-include \
+		include \
+		javah \
+		$(AWT11DIRS) \
+		classsrc \
+		$(JTOOLS) \
+		md \
+		runtime \
+		awt \
+		mmedia \
+		jpegwrap \
+		zipwrap \
+		bn \
+		jdbc \
+		$(NETSCAPEDIR) \
+		$(NULL)
+
+ifeq ($(STAND_ALONE_JAVA),1)
+NETSCAPEDIR	= netscape/console
+else
+JTOOLS		= jtools
+NETSCAPEDIR	= netscape
 endif
+
 ifeq ($(AWT_11),1)
 AWT11DIRS	= classsrc11
 endif
+
 endif
 
-LOOP_OVER_OTHER_DIRS =						\
+OTHER_DIRS	= javac javadoc doc javap
+
+LOOP_OVER_OTHER_DIRS = \
 	@for d in $(OTHER_DIRS); do \
 		if test -d $$d; then \
 			set -e; \
@@ -67,3 +86,4 @@ $(OTHER_DIRS)::
 
 other_dirs::
 	+$(LOOP_OVER_OTHER_DIRS)
+
diff --git a/mozilla/sun-java/stubs/Makefile.in b/mozilla/sun-java/stubs/Makefile.in
index 4432e914d12..4c8309dd344 100644
--- a/mozilla/sun-java/stubs/Makefile.in
+++ b/mozilla/sun-java/stubs/Makefile.in
@@ -17,10 +17,12 @@
 
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
 
 DIRS		= jri include
 
-include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/sun-java/stubs/include/Makefile.in b/mozilla/sun-java/stubs/include/Makefile.in
index f91f5f2a640..9b998f3e225 100644
--- a/mozilla/sun-java/stubs/include/Makefile.in
+++ b/mozilla/sun-java/stubs/include/Makefile.in
@@ -17,32 +17,35 @@
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
 
 MODULE		= java
 
-EXPORTS		= bool.h \
-		  interpreter.h \
-		  javaString.h \
-		  javaThreads.h \
-		  jmc.h \
-		  jni.h \
-		  jni_md.h \
-		  jri.h \
-		  jri_md.h \
-		  jriext.h \
-		  jritypes.h \
-		  nspr_md.h \
-		  oobj.h \
-		  sysmacros_md.h \
-		  tree.h \
-		  typedefs.h \
-		  typedefs_md.h \
-		  zip.h \
-		  $(NULL)
+EXPORTS		= \
+		bool.h \
+		interpreter.h \
+		javaString.h \
+		javaThreads.h \
+		jmc.h \
+		jni.h \
+		jni_md.h \
+		jri.h \
+		jri_md.h \
+		jriext.h \
+		jritypes.h \
+		nspr_md.h \
+		oobj.h \
+		sysmacros_md.h \
+		tree.h \
+		typedefs.h \
+		typedefs_md.h \
+		zip.h \
+		$(NULL)
 
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
-include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/sun-java/stubs/jri/Makefile.in b/mozilla/sun-java/stubs/jri/Makefile.in
index be18c66675f..2d2c3887a96 100644
--- a/mozilla/sun-java/stubs/jri/Makefile.in
+++ b/mozilla/sun-java/stubs/jri/Makefile.in
@@ -17,13 +17,15 @@
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
 
 MODULE		= java
 
 EXPORTS		= java_lang_String.h jdk_java_lang_String.h
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
-include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
+
diff --git a/mozilla/sun-java/stubs/src/Makefile.in b/mozilla/sun-java/stubs/src/Makefile.in
index 52b68f9e29b..f7c6bb990fb 100644
--- a/mozilla/sun-java/stubs/src/Makefile.in
+++ b/mozilla/sun-java/stubs/src/Makefile.in
@@ -17,17 +17,17 @@
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
-VPATH		= @srcdir@
 srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= stubsj
 MODULE		= java
+LIBRARY_NAME	= stubsj
 
-DEFINES		=
 REQUIRES	= java
 
 CSRCS		= stubsj.c
 
-include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk