From 13770b909f7a9834bba92a39fe7df8e4ca569614 Mon Sep 17 00:00:00 2001
From: "mcafee%netscape.com"
 <mcafee%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 8 Jun 2002 06:59:53 +0000
Subject: [PATCH] Splitting liveconnect off from the java module, new module is
 called liveconnect, similar to what was done for xpconnect (145347). 
 r=blythe, sr=alecf, a=asa

git-svn-id: svn://10.0.0.236/trunk@122934 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/config/module2dir.pl            |  3 ++-
 mozilla/js/src/liveconnect/Makefile.in  |  3 ++-
 mozilla/js/src/liveconnect/makefile.win |  3 ++-
 mozilla/modules/oji/src/Makefile.in     |  1 +
 mozilla/modules/oji/src/makefile.win    |  1 +
 mozilla/tools/module-deps/all.dot       | 10 ++++++----
 6 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/mozilla/config/module2dir.pl b/mozilla/config/module2dir.pl
index e2cfdc87965..4b160ab35f9 100755
--- a/mozilla/config/module2dir.pl
+++ b/mozilla/config/module2dir.pl
@@ -81,7 +81,7 @@ my %map = (
   'intl',               'intl',
   'intlcmpt',           'intl/compatibility',
   'jar',                'modules/libjar',
-  'java',               'sun-java/stubs js/jsd/classes js/src/liveconnect',
+  'java',               'sun-java/stubs js/jsd/classes',
   'jpeg',               'jpeg',
   'jprof',              'tools/jprof',
   'js',                 'js/src/fdlibm js/src',
@@ -91,6 +91,7 @@ my %map = (
   'jsloader',           'js/src/xpconnect/loader',
   'layout',             'layout',
   'libreg',             'modules/libreg',
+  'liveconnect',        'js/src/liveconnect',
   'locale',             'intl/locale',
   'lwbrk',              'intl/lwbrk',
   'mai',                'widget/src/gtk2/mai',
diff --git a/mozilla/js/src/liveconnect/Makefile.in b/mozilla/js/src/liveconnect/Makefile.in
index 081561ba330..998e9f25721 100644
--- a/mozilla/js/src/liveconnect/Makefile.in
+++ b/mozilla/js/src/liveconnect/Makefile.in
@@ -38,7 +38,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= java
+MODULE		= liveconnect
 LIBRARY_NAME	= jsj
 EXPORT_LIBRARY = 1
 ifeq ($(OS_ARCH),WINNT)
@@ -48,6 +48,7 @@ endif
 REQUIRES	= js \
 		  xpcom \
 		  xpconnect \
+		  java \
 		  $(NULL)
 
 CSRCS		= \
diff --git a/mozilla/js/src/liveconnect/makefile.win b/mozilla/js/src/liveconnect/makefile.win
index 3e77a2709f6..f7a669f4382 100644
--- a/mozilla/js/src/liveconnect/makefile.win
+++ b/mozilla/js/src/liveconnect/makefile.win
@@ -45,11 +45,12 @@
 #//
 #//------------------------------------------------------------------------
 DEPTH= ..\..\..
-MODULE = java
+MODULE = liveconnect
 REQUIRES	= xpcom \
 		  string\
                   js \
 		  xpconnect \
+		  java \
 		  $(NULL)
 include <$(DEPTH)/config/config.mak>
 
diff --git a/mozilla/modules/oji/src/Makefile.in b/mozilla/modules/oji/src/Makefile.in
index d1eb8e4e6fe..d2bcf668104 100644
--- a/mozilla/modules/oji/src/Makefile.in
+++ b/mozilla/modules/oji/src/Makefile.in
@@ -31,6 +31,7 @@ IS_COMPONENT	= 1
 MODULE_NAME	= nsCJVMManagerModule
 REQUIRES	= xpcom \
 		  string \
+		  liveconnect \
 		  java \
 		  js \
 		  plugin \
diff --git a/mozilla/modules/oji/src/makefile.win b/mozilla/modules/oji/src/makefile.win
index b88e25a8750..2ced188e6fc 100644
--- a/mozilla/modules/oji/src/makefile.win
+++ b/mozilla/modules/oji/src/makefile.win
@@ -20,6 +20,7 @@ LIBRARY_NAME=oji
 MODULE_NAME=nsCJVMManagerModule
 REQUIRES	= xpcom \
 		  string \
+		  liveconnect \
 		  java \
 		  js \
 		  plugin \
diff --git a/mozilla/tools/module-deps/all.dot b/mozilla/tools/module-deps/all.dot
index edf44aaf035..e22c2ad5afb 100644
--- a/mozilla/tools/module-deps/all.dot
+++ b/mozilla/tools/module-deps/all.dot
@@ -219,10 +219,11 @@ digraph G {
     unicharutil -> xpcom;
     unicharutil -> necko;
     unicharutil -> uconv;
-    java -> string;
-    java -> xpconnect;
-    java -> xpcom;
-    java -> js;
+    liveconnect -> string;
+    liveconnect -> xpconnect;
+    liveconnect -> xpcom;
+    liveconnect -> js;
+    liveconnect -> java;
     jar -> string;
     jar -> zlib;
     jar -> xpcom;
@@ -847,6 +848,7 @@ digraph G {
     oji -> dom;
     oji -> gfx;
     oji -> java;
+    oji -> liveconnect;
     oji -> docshell;
     oji -> xpconnect;
     oji -> js;