NOT PART OF BUILD. Updated embed.mak to work again. b=68688

embed.mak

@@ -20,117 +20,131 @@
 NECKO=1
 DEPTH=.
 
+# The following list of modules export headers, IDL files etc.
+
+EMBEDDING_EXPORTS = \
+	config \
+	nsprpub \
+!if defined (MOZ_STATIC_COMPONENTS)
+	modules\staticmod
+!endif
+	dbm \
+	modules\libreg \
+	xpcom \
+	js \
+	js\src\xpconnect \
+	js\src\liveconnect \
+	modules\zlib \
+	widget\timer \
+	include \
+	modules\libutil \
+	netwerk \
+!if defined(BUILD_PSM)
+	security \
+!endif
+	uriloader \
+	uriloader\exthandler \
+	intl \
+	modules\libpref \
+	jpeg \
+	modules\libimg \
+	gfx \
+	widget \
+	modules\oji \
+	modules\plugin \
+	modules\libjar \
+	modules\libimg\png \
+	caps \
+	expat \
+	htmlparser \
+	dom \
+	view \
+	layout \
+	db \
+	rdf \
+	docshell \
+	webshell \
+	embedding \
+	editor \
+	sun-java \
+	profile \
+	xpfe \
+	extensions \
+!if defined(BUILD_PSM)
+	extensions\psm-glue \
+!endif
+	xpinstall \
+	profile \
+	$(NULL)
+
+
+# The following list of modules must be built
+
+EMBEDDING_INSTALLS = \
+	config \
+	nsprpub \
+!if defined (MOZ_STATIC_COMPONENTS)
+	modules\staticmod
+!endif		
+	dbm \
+	modules\libreg \
+	xpcom \
+	modules\libutil \
+	jpeg \
+	modules\libimg \
+	widget\timer \
+	gfx \
+	widget \
+	js \
+	js\src\xpconnect \
+	js\src\liveconnect \
+	modules\zlib \
+	modules\zlib\standalone \
+	netwerk \
+!if defined(BUILD_PSM)
+	security \
+!endif
+	uriloader \
+	intl \
+	modules\libpref \
+	modules\oji \
+	modules\libjar \
+	caps \
+	expat \
+	htmlparser \
+	dom \
+	view \
+	layout \
+	rdf \
+	docshell \
+	webshell \
+	embedding \
+	editor \
+	xpfe\appshell \
+	xpfe\components\shistory \
+	extensions\cookie \
+!if defined(BUILD_PSM)
+	extensions\psm-glue \
+!endif
+	profile \
+	xpfe\global \
+	themes\classic \
+	embedding\config \
+	$(NULL)
+
+
 DIRS = \
 !if defined (exporting)
-		config \
-		nsprpub \
-!if defined (MOZ_STATIC_COMPONENTS)
-		 modules\staticmod
-!endif
-		dbm \
-		modules\libreg \
-		xpcom \
-		js \
-		js\src\xpconnect \
-		js\src\liveconnect \
-		modules\zlib \
-		widget\timer \
-		include \
-		modules\libutil \
-		netwerk \
-		modules\appfilelocprovider \
-!if defined(BUILD_PSM)
-                security \
-!endif
-		uriloader \
-                uriloader\exthandler \
-		intl \
-		modules\libpref \
-		jpeg \
-		modules\libimg \
-		gfx \
-		widget \
-		modules\oji \
-		modules\plugin \
-		modules\libjar \
-		modules\libimg\png \
-		caps \
-		expat \
-		htmlparser \
-		dom \
-		view \
-		layout \
-		db \
-		rdf \
-		docshell \
-		webshell \
-		embedding \
-		editor \
-		sun-java \
-		profile \
-		xpfe \
-		extensions \
-!if defined(BUILD_PSM)
-                extensions\psm-glue \
-!endif
-		mailnews \
-		xpinstall \
-		$(NULL)
+	$(EMBEDDING_EXPORTS) \
 !else
-		config \
-		nsprpub \
-!if defined (MOZ_STATIC_COMPONENTS)
-		modules\staticmod
-!endif		
-		dbm \
-		modules\libreg \
-		xpcom \
-		modules\libutil \
-		jpeg \
-		modules\libimg \
-		widget\timer \
-		gfx \
-		widget \
-		js \
-		js\src\xpconnect \
-		js\src\liveconnect \
-		modules\zlib \
-		modules\zlib\standalone \
-		netwerk \
-!if defined(BUILD_PSM)
-                security \
+	$(EMBEDDING_INSTALLS) \
 !endif
-		uriloader \
-		intl \
-		modules\libpref \
-		modules\oji \
-		modules\libjar \
-		caps \
-		expat \
-		htmlparser \
-		dom \
-		view \
-		layout \
-		rdf \
-		docshell \
-		modules\appfilelocprovider \
-		webshell \
-		embedding \
-		editor \
-		xpfe\appshell \
-		xpfe\components\shistory \
-		extensions\cookie \
-!if defined(BUILD_PSM)
-                extensions\psm-glue \
-!endif
-		$(NULL)
-!endif
-
+	$(NULL)
 
 include <$(DEPTH)\config\rules.mak>
 
-all:: build_small
+all:: build_embed
 
-build_small:
+build_embed:
 	$(MAKE) -f embed.mak export exporting=1
 	$(MAKE) -f embed.mak install