bug 543038 - pymake can't build mobile-browser r=mfinkle
authorBrad Lassey <blassey@mozilla.com>
Thu, 04 Mar 2010 00:46:36 -0500
changeset 1367 47b658f2a87d58e4c0f726b0051e41ef579a4098
parent 1366 1cd7f43892c4efdec4cc0ff25a968926055c21b6
child 1368 cd268c82f84b0100c21c64aa2eeaeadf83c9fee4
push id1219
push userblassey@mozilla.com
push dateThu, 04 Mar 2010 05:47:11 +0000
reviewersmfinkle
bugs543038
bug 543038 - pymake can't build mobile-browser r=mfinkle
app/Makefile.in
locales/Makefile.in
--- a/app/Makefile.in
+++ b/app/Makefile.in
@@ -62,17 +62,20 @@ endif
 LIBS += $(APP_XPCOM_LIBS) \
 	$(NSPR_LIBS) \
 	$(NULL)
 
 ifdef BUILD_STATIC_LIBS
 LIBS += $(DEPTH)/toolkit/xre/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
 else
 ifneq (,$(filter OS2 WINCE WINNT,$(OS_ARCH)))
-LIBS += $(LIB_PREFIX)xul.$(LIB_SUFFIX)
+LIBS += $(LIBXUL_DIST)/lib/$(LIB_PREFIX)xul.$(LIB_SUFFIX)
+ifndef WINCE
+OS_LIBS += version.lib
+endif
 endif
 endif
 
 ifdef _MSC_VER
 # Always enter a Windows program through wmain, whether or not we're
 # a console application.
 ifdef WINCE
 WIN32_EXE_LDFLAGS += -ENTRY:mainWCRTStartup
@@ -184,12 +187,12 @@ ifdef LIBXUL_SDK
 endif
 endif # SKIP_COPY_XULRUNNER
 
 	$(NSINSTALL) -D $(DIST)/bin/chrome/icons/default
 
 ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
 	cp $(srcdir)/$(APP_ICON).ico $(DIST)/bin/chrome/icons/default/$(APP_ICON).ico
 	cp $(srcdir)/$(APP_SPLASH).bmp $(DIST)/bin/$(APP_SPLASH).bmp
-	$(REDIT_PATH)/redit $(DIST)/bin/$(APP_BINARY) $(srcdir)/$(APP_ICON).ico
+	$(REDIT_PATH)/redit$(HOST_BIN_SUFFIX) $(DIST)/bin/$(APP_BINARY) $(srcdir)/$(APP_ICON).ico
 endif
 
 endif
--- a/locales/Makefile.in
+++ b/locales/Makefile.in
@@ -65,21 +65,22 @@ PREF_JS_EXPORTS = $(firstword $(wildcard
 # Shouldn't := DEB_BUILD_ARCH despite the $(shell ) as deb isn't everywhere
 DEB_BUILD_ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 DATASTAGE = $(CURDIR)/data-stage
 
 SEARCH_PLUGINS = $(shell cat \
   $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \
        @srcdir@/en-US/searchplugins/list.txt ) )
 
-searchplugins::
-	@echo "$(AB_CD).jar:" > tmp-search.jar.mn
-	@for line in $(foreach plugin,$(SEARCH_PLUGINS),"locale/$(AB_CD)/browser/searchplugins/$(notdir $(plugin)).xml ($(plugin).xml)"); do \
-	    echo " $$line" >> tmp-search.jar.mn; \
-	done
+tmp-search.jar.mn::
+	@echo -n "$(AB_CD).jar:" > $@
+	printf "$(foreach plugin,$(SEARCH_PLUGINS),$(subst __PLUGIN_SUBST__,$(plugin), \n locale/$(AB_CD)/browser/searchplugins/__PLUGIN_SUBST__.xml (__PLUGIN_SUBST__.xml)))" >>  $@
+	@echo   >> $@
+
+searchplugins: tmp-search.jar.mn
 	$(PYTHON) $(MOZILLA_DIR)/config/JarMaker.py \
           $(QUIET) -j $(FINAL_TARGET)/chrome \
           -s $(topsrcdir)/$(relativesrcdir)/en-US/searchplugins \
           -s $(LOCALE_SRCDIR)/searchplugins \
           $(MAKE_JARS_FLAGS) tmp-search.jar.mn
 
 export:: searchplugins