Fixing more of the bustage. npodb

embedding/minimo/wince/Makefile.in

@@ -82,20 +82,12 @@ LIBS		= \
 		$(MOZ_JS_LIBS) \
 		$(NULL)
 
-
 LOCAL_INCLUDES	= -I$(srcdir)
 
 include $(topsrcdir)/config/config.mk
 
 OS_LIBS += $(call EXPAND_LIBNAME, aygshell cellcore)
 
-# Force applications to be built non-statically
-# when building the mozcomps meta component
-ifneq (,$(filter mozcomps,$(MOZ_META_COMPONENTS)))
-BUILD_STATIC_LIBS=
-BUILD_SHARED_LIBS=1
-endif
-
 ifdef BUILD_STATIC_LIBS
 
 FINAL_LINK_COMPS=$(topsrcdir)/embedding/minimo/wince/minimo-link-comps
@@ -115,7 +107,9 @@ endif # BUILD_STATIC_LIBS
 include $(topsrcdir)/config/rules.mk
 
 ifdef BUILD_STATIC_LIBS
+
 include $(topsrcdir)/config/static-rules.mk
+
 endif # BUILD_STATIC_LIBS
 
 

embedding/minimo/wince/winEmbed.cpp

@@ -37,8 +37,7 @@
 #include "MinimoPrivate.h"
 
 #ifdef _BUILD_STATIC_BIN
-nsStaticModuleInfo const *const kPStaticModules = nsnull;
-PRUint32 const kStaticModuleCount = 0;
+#include "nsStaticComponents.h"
 #endif
 
 // Global variables