Hopefully the final fix for phoenix bustage. Phoenix bookmarks are now

have MODULE=bookmarks, headers in dist/include/bookmarks.  Make sure
makefiles are generated and directories are traversed in the right order.
Miscellaneous cleanup.  Affects phoenix build only.

allmakefiles.sh

@@ -846,6 +846,8 @@ browser/app/Makefile
 browser/base/Makefile
 browser/components/Makefile
 browser/components/bookmarks/Makefile
+browser/components/bookmarks/public/Makefile
+browser/components/bookmarks/src/Makefile
 browser/components/build/Makefile
 browser/components/console/Makefile
 browser/components/downloads/Makefile

browser/components/bookmarks/Makefile.in

@@ -23,9 +23,10 @@ DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-DIRS    = src public
 
 include $(DEPTH)/config/autoconf.mk
 
+DIRS		= public src
+
 include $(topsrcdir)/config/rules.mk
 

browser/components/bookmarks/public/Makefile.in

@@ -26,7 +26,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= browsercomps
+MODULE		= bookmarks
 XPIDL_MODULE	= bookmarks
 
 XPIDLSRCS	= nsIBookmarksService.idl

browser/components/bookmarks/src/Makefile.in

@@ -26,7 +26,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= appcomps
+MODULE		= bookmarks
 LIBRARY_NAME	= bookmarks_s
 
 REQUIRES	= xpcom \

browser/components/build/Makefile.in

@@ -24,11 +24,12 @@ REQUIRES = \
 	uriloader \
 	dom \
 	necko \
-  nkcache \
-  txmgr \
+	nkcache \
+	txmgr \
 	webbrowserpersist \
 	progressDlg \
 	mimetype \
+	bookmarks \
 	$(NULL)
 
 EXPORTS = nsBrowserCompsCID.h
@@ -42,19 +43,19 @@ endif
 
 LOCAL_INCLUDES = \
 	-I$(srcdir)/../downloads/src \
-  -I$(srcdir)/../bookmarks/src \
+	-I$(srcdir)/../bookmarks/src \
 	$(NULL)
 
 SHARED_LIBRARY_LIBS = \
 	$(DIST)/lib/$(LIB_PREFIX)download_s.$(LIB_SUFFIX) \
-  $(DIST)/lib/$(LIB_PREFIX)bookmarks_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)bookmarks_s.$(LIB_SUFFIX) \
 	$(NULL)
 
 EXTRA_DSO_LDOPTS += \
 	$(EXTRA_DSO_LIBS) \
 	$(MOZ_UNICHARUTIL_LIBS) \
 	$(MOZ_COMPONENT_LIBS) \
-  $(MOZ_XPCOM_OBSOLETE_LIBS) \
+	$(MOZ_XPCOM_OBSOLETE_LIBS) \
 	$(MOZ_JS_LIBS) \
 	$(NULL)
 

xpfe/components/search/src/Makefile.in

@@ -39,6 +39,10 @@ REQUIRES	= xpcom \
 		  unicharutil \
 		  $(NULL)
 
+ifdef MOZ_PHOENIX
+REQUIRES	+= bookmarks
+endif
+
 CPPSRCS		= \
 		nsInternetSearchService.cpp \
 		nsLocalSearchService.cpp \