Fixing linux build bustage for Minimo. b=306087 r=bsmedberg

Makefile.in

@@ -373,7 +373,7 @@ tier_99_dirs	+= suite
 endif
 
 ifdef MINIMO
-tier_99_dirs	+= embedding/minimo minimo
+tier_99_dirs	+= minimo embedding/minimo
 endif
 
 ifdef MOZ_XUL_APP

embedding/browser/gtk/src/Makefile.in

@@ -129,9 +129,7 @@ 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
+ifndef MINIMO
 EMBED_MANIFEST=$(topsrcdir)/embedding/config/basebrowser-unix
 endif
 
@@ -140,6 +138,13 @@ FINAL_LINK_COMPS=embed-link-comps
 FINAL_LINK_COMP_NAMES=embed-link-comp-names
 endif
 
+ifdef MINIMO
+FINAL_LINK_COMPS=$(topsrcdir)/minimo/base/linux/minimo-link-comps
+FINAL_LINK_COMP_NAMES=$(topsrcdir)/minimo/base/linux/minimo-link-names
+FINAL_LINK_LIBS=$(topsrcdir)/minimo/base/linux/minimo-link-libs
+endif
+
+
 # Create a map that we can use to go from library name to component
 # symbol. N.B. that this will break if the $(FINAL_LINK_COMP_NAMES)
 # and $(FINAL_LINK_COMPS) somehow get out-of-sync and aren't in
@@ -172,7 +177,6 @@ embed-link-comps: $(EMBED_MANIFEST) components
 embed-link-comp-names: embed-link-comps components
 	sort embed-link-comps | join -o 2.2 - components > $@
 
-
 GARBAGE += embed-link-comp-names embed-link-comps components
 endif
 
@@ -195,4 +199,3 @@ CFLAGS          += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS)
 DEFINES         += -D_IMPL_GTKMOZEMBED
 
 
-

embedding/browser/gtk/tests/Makefile.in

@@ -105,6 +105,13 @@ ifndef MOZ_FAT_EMBED
 FINAL_LINK_COMPS=../src/embed-link-comps
 endif
 
+ifdef MINIMO
+FINAL_LINK_COMPS=$(topsrcdir)/minimo/base/linux/minimo-link-comps
+FINAL_LINK_COMP_NAMES=$(topsrcdir)/minimo/base/linux/minimo-link-names
+FINAL_LINK_LIBS=$(topsrcdir)/minimo/base/linux/minimo-link-libs
+endif
+
+
 include $(topsrcdir)/config/static-config.mk
 
 EXTRA_DEPS	+= $(STATIC_EXTRA_DEPS)

embedding/minimo/app/Makefile.in

@@ -1,122 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Mozilla browser.
-#
-# The Initial Developer of the Original Code is
-# Christopher Blizzard.
-# Portions created by the Initial Developer are Copyright (C) 1999
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MOZILLA_INTERNAL_API = 1
-
-MODULE		= minimo
-REQUIRES	= gtkembedmoz \
-		  xpcom \
-		  string \
-		  dom \
-                  chrome \
-		  locale \
-		  webbrowserpersist \
-		  find \
-		  docshell \
-		  webshell \
-		  widget \
-		  content \
-		  browser \
-		  necko \
-		  pref \
-		  history \
-		  gfx \
-		  webbrowserpersist \
-		  layout \
-		  webbrwsr \
-	          history \
-		  txtsvc \
-		  windowwatcher \
-		  appcomps \
-		  xpcom \
-		  nspr \
-		  xpcom_obsolete \
-		  $(NULL)
-
-ifdef NS_TRACE_MALLOC
-REQUIRES	+= tracemalloc
-endif
-
-CPPSRCS		= Minimo.cpp \
-                minimo_support.cpp \
-		minimo_bookmark.cpp \
-		minimo_history.cpp  \
-		minimo_callbacks.cpp \
-		minimo_context.cpp \
-		minimo_preference.cpp \
-		mozilla_api.cpp  
-
-PROGRAM = Minimo
-
-LIBS		+= \
-			-lgtkembedmoz \
-			$(XLDFLAGS) \
-			$(XLIBS) \
-			$(NULL)
-
-include $(topsrcdir)/config/config.mk
-
-ifdef BUILD_STATIC_LIBS
-
-FINAL_LINK_COMPS=$(topsrcdir)/embedding/minimo/app/minimo-link-comps
-
-include $(topsrcdir)/config/static-config.mk
-
-EXTRA_DEPS	+= $(STATIC_EXTRA_DEPS)
-EXTRA_DSO_LIBS	+= $(STATIC_EXTRA_DSO_LIBS)
-
-endif
-
-EXTRA_LIBS	+= -L$(DEPTH)/dist/lib/components \
-                   $(EXTRA_DSO_LIBS)              \
-                   $(STATIC_EXTRA_LIBS)           \
-                   $(MOZ_JS_LIBS)                 \
-                   $(MOZ_COMPONENT_LIBS)          \
-                   -lSM -lICE                     \
-		   $(TK_LIBS)                     \
-		   $(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
-CXXFLAGS	+= $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS)

embedding/minimo/app/minimo-link-comps

@@ -1,21 +0,0 @@
-caps
-chrmlite
-popuplite
-docshell
-editor
-embedcomponents
-gfx_gtk
-gklayout
-htmlpars
-i18n
-imglib2
-jar50
-necko
-nsappshell
-pipboot
-pipnss
-pref
-uconv
-webbrwsr
-widget_gtk2
-xpconnect