Adding support for static builds of minimo. r=pavlov. b=211645

config/static-config.mk

@@ -102,7 +102,9 @@ endif
 # STATIC_EXTRA_LIBS	+= $(TK_LIBS)
 
 # Some random modules require this
+ifndef MINIMO
 STATIC_EXTRA_LIBS	+= $(MOZ_XPCOM_OBSOLETE_LIBS)
+endif
 
 ifeq ($(OS_ARCH),WINNT)
 STATIC_EXTRA_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool)

embedding/browser/gtk/src/Makefile.in

@@ -144,7 +144,11 @@ ifdef BUILD_STATIC_LIBS
 # This is so sick! We'll work backwards from the embedding manifest to
 # produce the set of components that we need to link in to a
 # ``minimal'' embedding harness.
+ifdef MINIMO
+EMBED_MANIFEST=$(topsrcdir)/embedding/config/minimo-unix
+else
 EMBED_MANIFEST=$(topsrcdir)/embedding/config/basebrowser-unix
+endif
 
 ifdef MOZ_FAT_EMBED
 EMBED_LINK_COMPS=$(FINAL_LINK_COMPS)

embedding/config/Makefile.in

@@ -40,13 +40,18 @@ ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
   _PLATFORM = dos
   WINAPP=mfcembed
   #WINAPP=winembed
+else
+ifdef MINIMO
+  BASEBROWSER = minimo-unix
 else
   BASEBROWSER = basebrowser-unix
+endif
   CLIENTMANIFEST = client-unix
   _PLATFORM = unix
 endif
 endif
 
+
 embed_chrome: embed-jar.mn
 ifneq (jar,$(MOZ_CHROME_FILE_FORMAT))
 	$(PERL) -I$(srcdir) $(srcdir)/gen_mn.pl -manifest $(MOZILLA_DIR)/embedding/config/embed-jar.mn -mozpath $(MOZILLA_DIR) -chrome $(DIST)/bin/chrome > $(MOZILLA_DIR)/embedding/config/embed-tmp.mn
@@ -79,7 +84,9 @@ endif
 	fi
 	$(NSINSTALL) -t $(srcdir)/installed-chrome.txt $(DIST)/Embed/chrome
 	$(NSINSTALL) -t $(srcdir)/readme.html $(DIST)/Embed
-	-$(NSINSTALL) -t $(DEPTH)/embedding/lite/$(LIB_PREFIX)embed_lite$(DLL_SUFFIX) $(DIST)/Embed/components
+ifndef MINIMO
+	$(NSINSTALL) -t $(DEPTH)/embedding/lite/$(LIB_PREFIX)embed_lite$(DLL_SUFFIX) $(DIST)/Embed/components
+endif
 ifeq ($(OS_ARCH),WINNT)
 ifeq ($(WINAPP),mfcembed)
 	$(NSINSTALL) -t $(DIST)/bin/mfcembed.exe $(DIST)/Embed

xpcom/obsolete/component/Makefile.in

@@ -33,7 +33,9 @@ ifneq ($(OS_ARCH),WINNT)
 SHORT_LIBNAME	= xpcomctc
 endif
 
+ifdef MINIMO
 EXPORT_LIBRARY  = 1
+endif
 IS_COMPONENT	= 1
 GRE_MODULE	= 1
 

xpcom_obsolete/component/Makefile.in

@@ -33,7 +33,9 @@ ifneq ($(OS_ARCH),WINNT)
 SHORT_LIBNAME	= xpcomctc
 endif
 
+ifdef MINIMO
 EXPORT_LIBRARY  = 1
+endif
 IS_COMPONENT	= 1
 GRE_MODULE	= 1