ODFStudio: add opt-in studio build infrastructure

Change-Id: I704e7953e3b7cb49b9c230a82855f4117c5ae99c

RepositoryModule_host.mk

@@ -47,6 +47,13 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 ))
 endif
 
+ifneq ($(ENABLE_ODFSTUDIO),)
+$(eval $(call gb_Module_add_moduledirs,libreoffice,\
+    odfstudio \
+))
+endif
+
+
 $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	android \
     $(if $(ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS),, \

configure.ac

@@ -2645,30 +2645,22 @@ AC_ARG_ENABLE(bundle-mariadb,
         [When using MariaDB/MySQL libraries already on system, bundle them with the MariaDB Connector/LibreOffice.])
 )
 dnl ===================================================================
-dnl ODF Studio (optional build mode)
+dnl ODF Studio (optional experimental modules)
 dnl ===================================================================
 
-AC_ARG_ENABLE([odfstudio],
-  AS_HELP_STRING([--enable-odfstudio],
-    [Enable ODF Studio pedagogical and instrumentation modules]),
-  [enable_odfstudio=$enableval],
-  [enable_odfstudio=no])
+AC_ARG_ENABLE([studio],
+    AS_HELP_STRING([--enable-studio],
+        [Build optional ODF Studio experimental and instrumentation modules]),
+    [enable_studio=$enableval],
+    [enable_studio=no])
 
-AM_CONDITIONAL([ENABLE_ODFSTUDIO],
-  [test "x$enable_odfstudio" = "xyes"])
-
-if test "x$enable_odfstudio" = "xyes"; then
-  ENABLE_ODFSTUDIO=TRUE
-  AC_DEFINE([ENABLE_ODFSTUDIO], [1],
-    [Build with ODF Studio extensions])
+if test "x$enable_studio" = "xyes"; then
+    ENABLE_ODFSTUDIO=TRUE
 else
-  ENABLE_ODFSTUDIO=
+    ENABLE_ODFSTUDIO=
 fi
 
 AC_SUBST([ENABLE_ODFSTUDIO])
-AM_CONDITIONAL([ENABLE_ODFSTUDIO],
-  [test "x$ENABLE_ODFSTUDIO" = "xTRUE"])
-
 AC_ARG_WITH(system-postgresql,
     AS_HELP_STRING([--with-system-postgresql],
         [Use PostgreSQL libraries already on system, for building the PostgreSQL-SDBC

odfstudio/CustomTarget_smoketest.mk

@@ -0,0 +1,6 @@
+$(eval $(call gb_CustomTarget_CustomTarget,odfstudio/smoketest))
+
+$(call gb_CustomTarget_get_target,odfstudio/smoketest):
+	@echo "ODFStudio: optional build target enabled"
+	@mkdir -p $(dir $@)
+	@touch $@

odfstudio/Module_odfstudio.mk

@@ -0,0 +1,7 @@
+# ODF Studio - experimental / pedagogical module
+
+$(eval $(call gb_Module_Module,odfstudio))
+
+$(eval $(call gb_Module_add_targets,odfstudio,\
+    CustomTarget_smoketest \
+))

studio/Module_studio.mk

@@ -1,5 +0,0 @@
-# studio/Module_studio.mk
-# ODF Studio – experimental / pedagogical module
-
-$(eval $(call gb_Module_Module,studio))
-

studio/Repository.mk

@@ -1,8 +0,0 @@
-# Repository.mk
-
-ifneq ($(ENABLE_ODFSTUDIO),)
-$(eval $(call gb_Repository_add_modules,\
-    studio \
-))
-endif
-