Build libmozjs during the install phase.

Bug #104307 sr=jband


git-svn-id: svn://10.0.0.236/trunk@108015 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/js/src/makefile.win

@@ -39,17 +39,9 @@ DEPTH=..\..
 MODULE=js
 include <$(DEPTH)\config\config.mak>
 
-!ifdef MOZ_OJI
-!if !defined(XPCONNECT_STANDALONE)
-DIRS = liveconnect
-!endif
-!endif
-
 # Because WIN95 doesn't support recursive make, still need fdlibm in DIRS
 !if "$(WINOS)" == "WIN95"
-DIRS = $(DIRS) fdlibm xpconnect
-!else
-DIRS = $(DIRS) xpconnect
+DIRS = $(DIRS) fdlibm
 !endif
 
 #//------------------------------------------------------------------------
@@ -198,7 +190,7 @@ $(FDLIBM_LIBRARY):
     @cd $(MAKEDIR) 
 !endif
 
-export:: $(DLL)
+install:: $(DLL)
 	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin
 	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
 

mozilla/makefile.win

@@ -62,6 +62,10 @@ DIRS =                         \
   netwerk                      \
   widget\timer                 \
   js                           \
+  js\src\xpconnect             \
+!ifdef MOZ_OJI
+  js\src\liveconnect           \
+!endif
 !if !defined(DISABLE_JSD)
   js\jsd                       \
 !endif