Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
dougt%meer.net 2005-08-26 21:03:29 +00:00
parent 09ab89e547
commit f6f5604c98
5 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.in
View File

@ -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

13
embedding/browser/gtk/src/Makefile.in
View File

@ -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

7
embedding/browser/gtk/tests/Makefile.in
View File

@ -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)

4
embedding/minimo/app/Makefile.in
View File

@ -99,7 +99,9 @@ include $(topsrcdir)/config/config.mk
ifdef BUILD_STATIC_LIBS
FINAL_LINK_COMPS=$(topsrcdir)/embedding/minimo/app/minimo-link-comps
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
include $(topsrcdir)/config/static-config.mk

3
embedding/minimo/app/minimo-link-comps
View File

@ -1,5 +1,5 @@
caps
chrmlite
chrome
popuplite
docshell
editor
@ -19,3 +19,4 @@ uconv
webbrwsr
widget_gtk2
xpconnect
gkplugin