chip more files off the odkcommon.zip block

Change-Id: I3d5d841d094f397130e37799a2f26e4d85f7c136
Reviewed-on: https://gerrit.libreoffice.org/3533
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>

10 files changed, 193 insertions, 93 deletions

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index dc2ff275ff74..68c26e5cb1c9 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -29,8 +29,15 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
 		$(SRCDIR)/odk/util/check.pl \
 		$(call gb_Package_get_target,odk_bin) \
 		$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_cli)) \
-		$(if $(filter MACOSX,$(OS)),$(call gb_Package_get_target,odk_macosx)) \
+		$(call gb_Package_get_target,odk_config) \
+		$(if $(filter WNT,$(OS)),\
+			$(call gb_Package_get_target,odk_config_win),\
+			$(call gb_Package_get_target,odk_config_notwin) \
+		) \
+		$(call gb_Package_get_target,odk_docs) \
+		$(call gb_Package_get_target,odk_html) \
 		$(call gb_Package_get_target,odk_lib) \
+		$(if $(filter MACOSX,$(OS)),$(call gb_Package_get_target,odk_macosx)) \
 		$(if $(SOLAR_JAVA),$(call gb_Package_get_target,odk_unowinreg)) \
 		$(call gb_CustomTarget_get_target,odk/odkcommon)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1)
diff --git a/odk/CustomTarget_config_win.mk b/odk/CustomTarget_config_win.mk
new file mode 100644
index 000000000000..2a9fc1f2e80d
--- /dev/null
+++ b/odk/CustomTarget_config_win.mk
@@ -0,0 +1,19 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CustomTarget_CustomTarget,odk/config))
+
+$(eval $(call gb_CustomTarget_register_targets,odk/config,\
+    setsdkenv_windows.bat \
+))
+
+$(call gb_CustomTarget_get_workdir,odk/config)/setsdkenv_windows.bat : $(SRCDIR)/odk/config/setsdkenv_windows.bat
+	sed $< -e 's#__SDKNAME__#libreoffice$(PRODUCTVERSION)_sdk#' > $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/odk/CustomTarget_html.mk b/odk/CustomTarget_html.mk
new file mode 100644
index 000000000000..9c96ac41f514
--- /dev/null
+++ b/odk/CustomTarget_html.mk
@@ -0,0 +1,25 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CustomTarget_CustomTarget,odk/html))
+
+$(eval $(call gb_CustomTarget_register_targets,odk/html,\
+	docs/install.html \
+	docs/notsupported.html \
+	docs/tools.html \
+	examples/DevelopersGuide/examples.html \
+	examples/examples.html \
+	index.html \
+))
+
+$(call gb_CustomTarget_get_workdir,odk/html)/%.html : $(SRCDIR)/odk/%.html
+	$(call gb_Output_announce,$*.html,$(true),SED,1)
+	cat $< | tr -d "\015" | sed -e 's/%PRODUCT_RELEASE%/$(PRODUCTVERSION)/g' > $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/odk/CustomTarget_odkcommon.mk b/odk/CustomTarget_odkcommon.mk
index 99e42e63d133..246247a5bb28 100644
--- a/odk/CustomTarget_odkcommon.mk
+++ b/odk/CustomTarget_odkcommon.mk
@@ -22,96 +22,4 @@ $(call gb_CustomTarget_get_target,odk/odkcommon): \
 	$(call gb_CustomTarget_get_target,odk/odkcommon/idl) \
 	$(call gb_CustomTarget_get_target,odk/odkcommon/include)
 
-ifeq ($(OS),WNT)
-odk_CONFIGLIST := cfgWin.js \
-	setsdkenv_windows.template \
-	setsdkname.bat
-else
-odk_CONFIGLIST := configure.pl \
-	setsdkenv_unix \
-	setsdkenv_unix.sh.in \
-
-endif
-
-define odk_config
-odkcommon_ZIPLIST += $(1)
-$(call gb_CustomTarget_get_target,odk/odkcommon): $(odk_WORKDIR)/$(1)
-$(odk_WORKDIR)/$(1): $(SRCDIR)/odk/config/$(1)
-	mkdir -p $$(dir $$@)
-	$$(call gb_Output_announce,$$(subst $$(WORKDIR)/,,$$@),build,CPY,1)
-	cp $$< $$@
-endef
-
-$(foreach config,$(odk_CONFIGLIST),$(eval $(call odk_config,$(config))))
-
-ifeq ($(OS),WNT)
-odkcommon_ZIPLIST += setsdkenv_windows.bat
-$(eval $(call gb_CustomTarget_register_targets,odk/odkcommon,\
-	setsdkenv_windows.bat \
-))
-$(odk_WORKDIR)/setsdkenv_windows.bat: $(SRCDIR)/odk/config/setsdkenv_windows.bat
-	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,SED,1)
-	sed $< -e 's#__SDKNAME__#libreoffice$(PRODUCTVERSION)_sdk#' > $@
-else
-odkcommon_ZIPLIST += config.guess config.sub
-$(eval $(call gb_CustomTarget_register_targets,odk/odkcommon,\
-	config.guess \
-	config.sub \
-))
-$(odk_WORKDIR)/config.%: $(SRCDIR)/config.%
-	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CPY,1)
-	cp $< $@
-endif
-
-odk_HTMLLIST := index.html \
-	docs/tools.html \
-	docs/notsupported.html \
-	docs/install.html \
-	examples/examples.html \
-	examples/DevelopersGuide/examples.html
-
-odk_DOCULIST := docs/sdk_styles.css \
-	docs/common/ref/idl.css \
-	docs/images/nada.gif \
-	docs/images/arrow-1.gif \
-	docs/images/arrow-2.gif \
-	docs/images/arrow-3.gif \
-	docs/images/bluball.gif \
-	docs/images/ooo-main-app_32.png \
-	docs/images/odk-footer-logo.gif \
-	docs/images/bg_table.png \
-	docs/images/bg_table2.png \
-	docs/images/bg_table3.png \
-	docs/images/nav_down.png \
-	docs/images/nav_home.png \
-	docs/images/nav_left.png \
-	docs/images/nav_right.png \
-	docs/images/nav_up.png \
-	docs/images/sdk_head-1.png \
-	docs/images/sdk_head-2.png \
-	docs/images/sdk_line-1.gif \
-	docs/images/sdk_line-2.gif
-
-define odk_html
-odkcommon_ZIPLIST += $(1)
-$(call gb_CustomTarget_get_target,odk/odkcommon): $(odk_WORKDIR)/$(1)
-$(odk_WORKDIR)/$(1): $(SRCDIR)/odk/$(1)
-	mkdir -p $$(dir $$@)
-	$$(call gb_Output_announce,$$(subst $$(WORKDIR)/,,$$@),build,SED,1)
-	cat $$< | tr -d "\015" | \
-		sed -e 's/%PRODUCT_RELEASE%/$(PRODUCTVERSION)/g' > $$@
-endef
-
-define odk_docu
-odkcommon_ZIPLIST += $(1)
-$(call gb_CustomTarget_get_target,odk/odkcommon): $(odk_WORKDIR)/$(1)
-$(odk_WORKDIR)/$(1): $(SRCDIR)/odk/$(1)
-	mkdir -p $$(dir $$@)
-	$$(call gb_Output_announce,$$(subst $$(WORKDIR)/,,$$@),build,CPY,1)
-	cp $$< $$@
-endef
-
-$(foreach html,$(odk_HTMLLIST),$(eval $(call odk_html,$(html))))
-$(foreach doc,$(odk_DOCULIST),$(eval $(call odk_docu,$(doc))))
-
 # vim: set noet sw=4 ts=4:
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 58bdb4d60a8c..6a51a13f9c49 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -14,14 +14,29 @@ $(eval $(call gb_Module_add_targets,odk,\
 	$(if $(filter WNT,$(OS)),Package_cli) \
 	$(if $(DOXYGEN),CustomTarget_doxygen) \
 	CustomTarget_check \
+	CustomTarget_html \
 	CustomTarget_settings \
 	CustomTarget_autodoc \
 	Executable_unoapploader \
 	Package_bin \
+	Package_config \
+	Package_docs \
+	Package_html \
 	Package_examples \
 	Package_lib \
 ))
 
+ifeq ($(OS),WNT)
+$(eval $(call gb_Module_add_targets,odk,\
+	CustomTarget_config_win \
+	Package_config_win \
+))
+else
+$(eval $(call gb_Module_add_targets,odk,\
+	Package_config_notwin \
+))
+endif
+
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_Module_add_targets,odk,\
 	Package_macosx \
diff --git a/odk/Package_config.mk b/odk/Package_config.mk
new file mode 100644
index 000000000000..a58620eb05be
--- /dev/null
+++ b/odk/Package_config.mk
@@ -0,0 +1,28 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,odk_config,$(SRCDIR)/odk/config))
+
+$(eval $(call gb_Package_set_outdir,odk_config,$(INSTDIR)))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Package_add_files,odk_config,$(gb_Package_SDKDIRNAME),\
+	cfgWin.js \
+	setsdkenv_windows.template \
+	setsdkname.bat \
+))
+else
+$(eval $(call gb_Package_add_files,odk_config,$(gb_Package_SDKDIRNAME),\
+	configure.pl \
+	setsdkenv_unix \
+	setsdkenv_unix.sh.in \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/odk/Package_config_notwin.mk b/odk/Package_config_notwin.mk
new file mode 100644
index 000000000000..37c1b2beed43
--- /dev/null
+++ b/odk/Package_config_notwin.mk
@@ -0,0 +1,19 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,odk_config_notwin,$(SRCDIR)))
+
+$(eval $(call gb_Package_set_outdir,odk_config_notwin,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,odk_config_notwin,$(gb_Package_SDKDIRNAME),\
+	config.guess \
+	config.sub \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/odk/Package_config_win.mk b/odk/Package_config_win.mk
new file mode 100644
index 000000000000..c2dadad6f3ca
--- /dev/null
+++ b/odk/Package_config_win.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,odk_config_win,$(call gb_CustomTarget_get_workdir,odk/config)))
+
+$(eval $(call gb_Package_set_outdir,odk_config_win,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_file,odk_config_win,$(gb_Package_SDKDIRNAME)/setsdkenv_windows.bat,setsdkenv_windows.bat))
+
+# vim: set noet sw=4 ts=4:
diff --git a/odk/Package_docs.mk b/odk/Package_docs.mk
new file mode 100644
index 000000000000..3206a0da3e6f
--- /dev/null
+++ b/odk/Package_docs.mk
@@ -0,0 +1,40 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,odk_docs,$(SRCDIR)/odk))
+
+$(eval $(call gb_Package_set_outdir,odk_docs,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files_with_dir,odk_docs,$(gb_Package_SDKDIRNAME),\
+	docs/images/arrow-1.gif \
+	docs/images/arrow-2.gif \
+	docs/images/arrow-3.gif \
+	docs/images/bg_table.png \
+	docs/images/bg_table2.png \
+	docs/images/bg_table3.png \
+	docs/images/bluball.gif \
+	docs/images/nada.gif \
+	docs/images/nav_down.png \
+	docs/images/nav_home.png \
+	docs/images/nav_left.png \
+	docs/images/nav_right.png \
+	docs/images/nav_up.png \
+	docs/images/odk-footer-logo.gif \
+	docs/images/ooo-main-app_32.png \
+	docs/images/sdk_head-1.png \
+	docs/images/sdk_head-2.png \
+	docs/images/sdk_line-1.gif \
+	docs/images/sdk_line-2.gif \
+	docs/sdk_styles.css \
+))
+
+# This is installed by CustomTarget_autodoc for now
+#	docs/common/ref/idl.css \
+
+# vim: set noet sw=4 ts=4:
diff --git a/odk/Package_html.mk b/odk/Package_html.mk
new file mode 100644
index 000000000000..7d66c3cd2aa5
--- /dev/null
+++ b/odk/Package_html.mk
@@ -0,0 +1,23 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,odk_html,$(call gb_CustomTarget_get_workdir,odk/html)))
+
+$(eval $(call gb_Package_set_outdir,odk_html,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files_with_dir,odk_html,$(gb_Package_SDKDIRNAME),\
+	docs/install.html \
+	docs/notsupported.html \
+	docs/tools.html \
+	examples/DevelopersGuide/examples.html \
+	examples/examples.html \
+	index.html \
+))
+
+# vim: set noet sw=4 ts=4: