Reversing previous checkin. This was not meant for the trunk just yet. Broken client.mk on the branch. :-/

Makefile.in

@@ -124,12 +124,12 @@ ifdef MOZ_JPROF
 DIRS        += tools/jprof
 endif
 
-DIRS		+= xpinstall
-
 ifdef MOZ_BUILD_XPFE
 DIRS		+= xpfe
 endif
 
+DIRS		+= xpinstall
+
 ifdef MOZ_PSM
 DIRS		+= security/nss security/manager
 endif
@@ -160,8 +160,6 @@ ifdef MOZ_STATIC_COMPONENTS
 DIRS   += modules/staticmod
 endif
 
-DIRS	+= xpfe/bootstrap
-
 endif # BUILD_MODULES == all
 
 STATIC_MAKEFILES := $(NSPRPUB_DIR) directory/c-sdk/ldap

config/config.mk

@@ -378,7 +378,7 @@ endif
 
 DEPENDENCIES	= .md
 
-MOZ_COMPONENT_LIBS=$(MOZ_COMPONENT_XPCOM_LIBS) $(MOZ_COMPONENT_NSPR_LIBS)
+MOZ_COMPONENT_LIBS=$(MOZ_COMPONENT_NSPR_LIBS) $(MOZ_COMPONENT_XPCOM_LIBS)
 
 ifdef GC_LEAK_DETECTOR
 MOZ_COMPONENT_XPCOM_LIBS += -lboehm

modules/plugin/default/unix/Makefile.in

@@ -62,9 +62,7 @@ CFLAGS		+= $(TK_CFLAGS)
 endif
 
 install-plugin: $(SHARED_LIBRARY)
-ifdef SHARED_LIBRARY
 	$(INSTALL) $(SHARED_LIBRARY) $(DIST)/bin/plugins
-endif
 
 install:: install-plugin
 

modules/plugin/samples/default/unix/Makefile.in

@@ -62,9 +62,7 @@ CFLAGS		+= $(TK_CFLAGS)
 endif
 
 install-plugin: $(SHARED_LIBRARY)
-ifdef SHARED_LIBRARY
 	$(INSTALL) $(SHARED_LIBRARY) $(DIST)/bin/plugins
-endif
 
 install:: install-plugin
 

xpfe/Makefile.in

@@ -26,7 +26,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= appshell components browser communicator global
+DIRS            = appshell bootstrap browser communicator components global
 
 include $(topsrcdir)/config/rules.mk