merging in make changes from SpiderMonkey140_BRANCH to name libraries correctly and package the right stuff. -mw

git-svn-id: svn://10.0.0.236/branches/SpiderMonkeyDev_BRANCH@20639 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/js/src/Makefile.ref

@@ -131,7 +131,26 @@ API_HFILES =		\
 	jsdbgapi.h	\
 	$(NULL)
 
-HFILES = $(JS_HFILES) $(API_HFILES)
+OTHER_HFILES =		\
+	jsaddr.h	\
+	jsbit.h		\
+	jscompat.h	\
+	jscpucfg.h	\
+	jsotypes.h	\
+	jsprhash.h	\
+	jsstddef.h	\
+	prmjtime.h	\
+	resource.h	\
+	jsopcode.tbl	\
+	js.msg		\
+	jsshell.msg	\
+	$(NULL)
+
+ifndef PREBUILT_CPUCFG
+OTHER_HFILES += $(OBJDIR)/jsautocfg.h
+endif
+
+HFILES = $(JS_HFILES) $(API_HFILES) $(OTHER_HFILES)
 
 JS_CFILES =		\
 	jsapi.c		\
@@ -188,7 +207,7 @@ SHARED_LIBRARY = $(OBJDIR)/js32.dll
 PROGRAM = $(OBJDIR)/js.exe
 else
 LIBRARY = $(OBJDIR)/libjs.a
-SHARED_LIBRARY = $(OBJDIR)/libjs.so
+SHARED_LIBRARY = $(OBJDIR)/libjs.$(SO_SUFFIX)
 PROGRAM = $(OBJDIR)/js
 endif
 

mozilla/js/src/config.mk

@@ -56,6 +56,8 @@ DEFINES    += -DDEBUG -DDEBUG_$(shell whoami)
 OBJDIR_TAG = _DBG
 endif
 
+SO_SUFFIX = so
+
 include $(DEPTH)/config/$(OS_CONFIG).mk
 
 # Name of the binary code directories

mozilla/js/src/config/HP-UXB.10.10.mk

@@ -29,6 +29,8 @@ CCC = CC -Ae +a1 +eh +Z
 RANLIB = echo
 MKSHLIB = $(LD) -b
 
+SO_SUFFIX = sl
+
 #.c.o:
 #	$(CC) -c -MD $*.d $(CFLAGS) $<
 

mozilla/js/src/config/HP-UXB.10.20.mk

@@ -29,6 +29,8 @@ CCC = CC -Ae +a1 +eh +Z
 RANLIB = echo
 MKSHLIB = $(LD) -b
 
+SO_SUFFIX = sl
+
 #.c.o:
 #	$(CC) -c -MD $*.d $(CFLAGS) $<
 

mozilla/js/src/config/HP-UXB.11.00.mk

@@ -27,6 +27,8 @@ CCC = CC -Ae +a1 +eh +Z
 RANLIB = echo
 MKSHLIB = $(LD) -b
 
+SO_SUFFIX = sl
+
 #.c.o:
 #	$(CC) -c -MD $*.d $(CFLAGS) $<
 

mozilla/js/src/jsconfig.mk

@@ -61,21 +61,17 @@ endif
 SHIP_DIST  = $(MOZ_DEPTH)/dist/$(OBJDIR)
 SHIP_DIR   = $(SHIP_DIST)/SHIP
 
-SHIP_LIBS      = libjs.so
+SHIP_LIBS      = libjs.$(SO_SUFFIX) libjs.a
 ifdef JS_LIVECONNECT
-  SHIP_LIBS   += jsj.so
+  SHIP_LIBS   += libjsj.$(SO_SUFFIX) libjsj.a
 endif
 # ifdef JS_THREADSAFE
-#   ifeq ($(OS_ARCH), HP-UX)
-#     SHIP_LIBS += libnspr21.sl
-#   else
-#     SHIP_LIBS += libnspr21.so
-#   endif
+#   SHIP_LIBS += libnspr21.$(SO_SUFFIX)
 # endif
 ifeq ($(OS_ARCH), WINNT)
-  SHIP_LIBS    = js32.dll
+  SHIP_LIBS    = js32.dll js32.lib
   ifdef JS_LIVECONNECT
-    SHIP_LIBS += jsj.dll
+    SHIP_LIBS += jsj.dll jsj.lib
   endif
 #   ifdef JS_THREADSAFE
 #     SHIP_LIBS += libnspr21.dll
@@ -83,9 +79,9 @@ ifeq ($(OS_ARCH), WINNT)
 endif
 SHIP_LIBS     := $(addprefix $(SHIP_DIST)/lib/, $(SHIP_LIBS))
 
-SHIP_INCS      = js*.h
+SHIP_INCS      = js*.h prmjtime.h resource.h *.msg *.tbl
 ifdef JS_LIVECONNECT
-  SHIP_INCS   += netscape*.h
+  SHIP_INCS   += netscape*.h nsC*.h nsI*.h
 endif
 SHIP_INCS     := $(addprefix $(SHIP_DIST)/include/, $(SHIP_INCS))
 

mozilla/js/src/liveconnect/Makefile.ref

@@ -39,9 +39,17 @@ LC_HFILES =		\
 	jsj_private.h   \
 	jsjava.h        \
 	netscape_javascript_JSObject.h \
+	nsCLiveconnectFactory.h        \
+	nsILiveconnect.h               \
+	nsISecureLiveconnect.h         \
+	nsISecurityContext.h           \
 	$(NULL)
 
-HFILES = $(LC_HFILES)
+OTHER_HFILES =		\
+	jsj.msg		\
+	$(NULL)
+
+HFILES = $(LC_HFILES) $(OTHER_HFILES)
 
 LC_CFILES =	\
 	jsj.c \
@@ -88,8 +96,8 @@ LIBRARY = $(OBJDIR)/jsj.lib
 SHARED_LIBRARY = $(OBJDIR)/jsj.dll
 PROGRAM = $(OBJDIR)/jsj.exe
 else
-LIBRARY = $(OBJDIR)/jsj.a
-SHARED_LIBRARY = $(OBJDIR)/jsj.so
+LIBRARY = $(OBJDIR)/libjsj.a
+SHARED_LIBRARY = $(OBJDIR)/libjsj.$(SO_SUFFIX)
 PROGRAM = $(OBJDIR)/jsj
 endif