Sync'd with Makefile

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

mozilla/js/src/liveconnect/Makefile.in

@@ -30,7 +30,6 @@ ifdef NSJVM
 DIRS		= classes
 endif
 
-
 MODULE		= java
 LIBRARY_NAME	= jsj
 
@@ -38,7 +37,6 @@ REQUIRES	= java js applet nspr img util layer
 ifdef MOZ_OJI
 REQUIRES	+= xpcom
 endif
-
 CSRCS = jsj.c		  \
 	jsj_JSObject.c	  \
 	jsj_JavaArray.c	  \
@@ -60,9 +58,12 @@ CPPSRCS		=	        \
 	nsCLiveconnectFactory.cpp
 endif
 
+LLIBS=$(LIBNSPR) $(DIST)/lib/js$(MOZ_BITS)$(VERSION_NUMBER).lib
 ifdef MOZ_OJI
 LLIBS += $(DIST)/lib/xpcom32.lib	
 endif
+ 
+
 
 ifdef NSJVM
 JNI_GEN		= netscape.javascript.JSObject netscape.javascript.JSException
@@ -73,9 +74,9 @@ EXPORTS		= $(srcdir)/jsjava.h \
 		  $(srcdir)/$(JNI_GEN_DIR)/netscape_javascript_JSException.h \
 		  $(NULL)
 ifdef MOZ_OJI
-EXPORTS		+=  nsILiveconnect.h \
-    nsISecureLiveconnect.h \
-    nsISecurityContext.h \
+EXPORTS		+=  $(srcdir)/nsILiveconnect.h \
+    $(srcdir)/nsISecureLiveconnect.h \
+    $(srcdir)/nsISecurityContext.h \
 		  $(NULL)
 endif
 
@@ -89,16 +90,16 @@ include $(topsrcdir)/config/rules.mk
 # These make rules only works on IRIX...sigh
 
 ifeq ($(OS_ARCH),IRIX)
-jsj_nodl.c: $(OBJDIR)/stubs.o Makefile $(topsrcdir)/config/nodl.pl
+jsj_nodl.c: $(OBJDIR)/stubs.o Makefile $(DEPTH)/config/nodl.pl
 	rm -f $@
-	$(PERL) $(topsrcdir)/config/nodl.pl "jsj_nodl_tab" \
+	$(PERL) $(DEPTH)/config/nodl.pl "jsj_nodl_tab" \
 	    `nm -Bn $(OBJDIR)/stubs.o | egrep Java_.*_stub | awk '{print $$3;}'` > $@
 endif
 
 ifdef JAVA_OR_OJI
 $(OBJDIR)/stubs.o:					 \
-	$(JRI_GEN_DIR)/netscape_javascript_JSObject.c	 \
-	$(JRI_GEN_DIR)/netscape_javascript_JSException.c \
+	$(JNI_GEN_DIR)/netscape_javascript_JSObject.c	 \
+	$(JNI_GEN_DIR)/netscape_javascript_JSException.c \
 	$(NULL)
 else
 $(OBJDIR)/stubs.o: