RepositoryModule_ooo.mk: add missing modules

Change-Id: Ieab82857f712c07e5bddc981d78f69b4c3a234b5

1 files changed, 29 insertions, 18 deletions

diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 0e3dcae5ae43..b654664f4f53 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -30,25 +30,31 @@ $(eval $(call gb_Module_Module,ooo))
 
 $(eval $(call gb_Module_add_moduledirs,ooo,\
     accessibility \
+	$(call gb_Helper_optional,AFMS,afms) \
     animations \
-    autodoc \
+	$(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \
     apple_remote \
+    autodoc \
     avmedia \
     basctl \
     basebmp \
     basegfx \
     basic \
     bean \
+	$(call gb_Helper_optional,BSH,beanshell) \
     binaryurp \
-    bluez_bluetooth \
+	$(call gb_Helper_optional,BLUEZ,bluez_bluetooth) \
 	boost \
+	bridges \
     canvas \
     chart2 \
-    clucene \
-    codemaker \
+	cli_ure \
+	$(call gb_Helper_optional,CLUCENE,clucene) \
+	$(call gb_Helper_optional,DESKTOP,codemaker) \
     comphelper \
     configmgr \
     connectivity \
+    cosv \
     cppcanvas \
     cppu \
     cppuhelper \
@@ -56,6 +62,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     cui \
     dbaccess \
     desktop \
+	$(call gb_Helper_optional,DICTIONARIES,dictionaries) \
     drawinglayer \
     dtrans \
     editeng \
@@ -70,18 +77,19 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     formula \
     fpicker \
     framework \
-	hsqldb \
+	$(call gb_Helper_optional,DESKTOP,helpcompiler) \
+	$(call gb_Helper_optional,HSQLDB,hsqldb) \
     hwpfilter \
     i18npool \
     i18nutil \
     idl \
-    idlc \
+	$(call gb_Helper_optional,DESKTOP,idlc) \
     io \
     javaunohelper \
     jurt \
     jvmaccess \
     jvmfwk \
-    l10ntools \
+	$(call gb_Helper_optional,DESKTOP,l10ntools) \
 	libcdr \
 	libcmis \
 	libmspub \
@@ -97,8 +105,9 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     MathMLDTD \
 	mdds \
     Mesa \
-	neon \
-    nlpsolver \
+	$(call gb_Helper_optional,MORE_FONTS,more_fonts) \
+	$(call gb_Helper_optional,NEON,neon) \
+	$(call gb_Helper_optional,NLPSOLVER,nlpsolver) \
     np_sdk \
     o3tl \
     offapi \
@@ -109,10 +118,12 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     packimages \
     padmin \
     psprint_config \
+	$(call gb_Helper_optional,PYUNO,pyuno) \
 	$(if $(strip $(OOO_JUNIT_JAR)),\
 		qadevOOo \
 	) \
-    rdbmaker \
+	$(call gb_Helper_optional,DESKTOP,rdbmaker) \
+	readlicense_oo \
     regexp \
     registry \
     remotebridges \
@@ -124,10 +135,11 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     salhelper \
     sane \
     sax \
+	$(call gb_Helper_optional,SAXON,saxon) \
     sc \
     scaddins \
     sccomp \
-    scp2 \
+	$(call gb_Helper_optional,DESKTOP,scp2) \
     scripting \
     sd \
     sdext \
@@ -147,17 +159,18 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     swext \
     test \
     testtools \
+	$(call gb_Helper_optional,TOMCAT,tomcat) \
     toolkit \
     tools \
 	touch \
-	$(if $(filter TRANSLATIONS,$(BUILD_TYPE)),\
-		translations \
-	) \
+	$(call gb_Helper_optional,TRANSLATIONS,translations) \
 	tubes \
     twain \
     ucb \
     ucbhelper \
+	$(call gb_Helper_optional,UCPP,ucpp) \
     udkapi \
+	udm \
     unixODBC \
     UnoControls \
     unodevtools \
@@ -173,12 +186,10 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     wizards \
     writerfilter \
     writerperfect \
-	$(if $(filter X11_EXTENSIONS,$(BUILD_TYPE)),\
-		x11_extensions \
-	) \
+	$(call gb_Helper_optional,X11_EXTENSIONS,x11_extensions) \
     xmerge \
     xml2cmp \
-    xmlhelp \
+	$(call gb_Helper_optional,DESKTOP,xmlhelp) \
     xmloff \
     xmlreader \
     xmlscript \