[mono] introduce BUILD_CLI variable; register new binaries

Change-Id: I64788235ec734409cae51c783dd05c02357f5851

Repository.mk

@@ -413,8 +413,10 @@ endif
 
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
     affine_uno \
+	climaker \
 	cli_cppuhelper \
 	cli_uno \
+	cli_uno_glue \
 	gcc3_uno \
 	java_uno \
     jpipe \
@@ -615,6 +617,7 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
     invocation \
     javaloader \
     javavm \
+    mono_loader \
     namingservice \
     proxyfac \
     reflection \

cli_ure/Module_cli_ure.mk

@@ -13,18 +13,47 @@ $(eval $(call gb_Module_add_targets,cli_ure,\
     Package_version \
 ))
 
-ifeq ($(COM),MSC)
+# common stuff 
+ifeq ($(BUILD_CLI),YES)
 $(eval $(call gb_Module_add_targets,cli_ure,\
 	CliLibrary_cli_basetypes \
 	CliLibrary_cli_ure \
-	CliNativeLibrary_cli_cppuhelper \
 	CliUnoApi_cli_uretypes \
 	CustomTarget_cli_ure_assemblies \
+	Package_config \
+))
+
+ifeq ($(COM),MSC)
+
+# Original implementation for Windows
+$(eval $(call gb_Module_add_targets,cli_ure,\
+	CliNativeLibrary_cli_cppuhelper \
 	Executable_climaker \
 	Library_cli_cppuhelper_native \
 	Library_cli_uno \
-	Package_config \
 ))
+
+else
+
+# Alternative implementation
+# FIXME: tested only on Linux
+$(eval $(call gb_Module_add_targets,cli_ure,\
+        CliLibrary_cli_cppuhelper_mono \
+        CliLibrary_cli_uno_bridge \
+        Library_cli_uno_unix \
+        Library_cli_uno_glue \
+        Library_mono_loader \
+))
+
+ifeq ($(ENABLE_MONO_CLIMAKER),YES)
+$(eval $(call gb_Module_add_targets,cli_ure,\
+        Executable_climaker_mono \
+        Library_climaker \
+))
+endif
+
+endif
+
 endif
 
 # vim: set noet sw=4 ts=4:

config_host.mk.in

@@ -39,6 +39,7 @@ export BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@
 export BOOST_LDFLAGS=@BOOST_LDFLAGS@
 export BOOST_SYSTEM_LIB=@BOOST_SYSTEM_LIB@
 export BSH_JAR=@BSH_JAR@
+export BUILD_CLI=@BUILD_CLI@
 export BUILD_DMAKE=@BUILD_DMAKE@
 export BUILD_PLATFORM=@build@
 export BUILD_POSTGRESQL_SDBC=@BUILD_POSTGRESQL_SDBC@

configure.ac

@@ -4986,6 +4986,13 @@ if test "$_os" = "Linux"; then
         MONO_GAC_ROOT=$with_mono_gac_root
     fi
 fi
+
+if test "$ENABLE_MONO" = "YES" -o "$COM" = "MSC" ; then
+    BUILD_CLI=YES
+else
+    BUILD_CLI=NO
+fi
+AC_SUBST(BUILD_CLI)
 AC_SUBST(CSC_PATH)
 AC_SUBST(CSC)
 AC_SUBST(AL)