[Libreoffice-commits] core.git: odk/Module_odk.mk
odk/Module_odk.mk |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 085c5c6beade545e4e93cf8463b6848cf2d19060 Author: David Tardon dtar...@redhat.com Date: Sun Apr 21 17:42:17 2013 +0200 make odk inst. check a check target Change-Id: I1bd8ee091a3c74ad05af69a4b7d5a2db21731b76 Reviewed-on: https://gerrit.libreoffice.org/3535 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 36eacef..6e78471 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -13,7 +13,6 @@ $(eval $(call gb_Module_add_targets,odk,\ CustomTarget_odkcommon \ $(if $(filter WNT,$(OS)),Package_cli) \ $(if $(DOXYGEN),CustomTarget_doxygen) \ - CustomTarget_check \ CustomTarget_html \ CustomTarget_settings \ CustomTarget_autodoc \ @@ -62,5 +61,8 @@ $(eval $(call gb_Module_add_targets,odk,\ Zip_odkcommon \ )) +$(eval $(call gb_Module_add_check_targets,odk,\ + CustomTarget_check \ +)) # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: odk/Module_odk.mk
odk/Module_odk.mk |6 +- 1 file changed, 1 insertion(+), 5 deletions(-) New commits: commit 7b6cac16ef01cd80f54ea75c72e0de9887bbf97a Author: Stephan Bergmann sberg...@redhat.com Date: Tue Feb 26 09:39:29 2013 +0100 Clean up Change-Id: I25cde2532ed9228b5b674908050a275c4206599e diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index d2409ec..349effb 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -20,6 +20,7 @@ $(eval $(call gb_Module_add_targets,odk,\ CustomTarget_autodoc \ CustomTarget_idl \ Executable_unoapploader \ + Zip_odkcommon \ Zip_odkexamples \ )) @@ -33,9 +34,4 @@ $(eval $(call gb_Module_add_targets,odk,\ )) endif -$(eval $(call gb_Module_add_targets,odk,\ - Zip_odkcommon \ -)) - - # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: odk/Module_odk.mk
odk/Module_odk.mk |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit b30e154c2b861397a80515ab8a18b6f0558a0939 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Feb 26 09:57:20 2013 +0100 Revert Clean up This reverts commit 7b6cac16ef01cd80f54ea75c72e0de9887bbf97a, dependency hell. diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 349effb..d2409ec 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -20,7 +20,6 @@ $(eval $(call gb_Module_add_targets,odk,\ CustomTarget_autodoc \ CustomTarget_idl \ Executable_unoapploader \ - Zip_odkcommon \ Zip_odkexamples \ )) @@ -34,4 +33,9 @@ $(eval $(call gb_Module_add_targets,odk,\ )) endif +$(eval $(call gb_Module_add_targets,odk,\ + Zip_odkcommon \ +)) + + # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: odk/Module_odk.mk
odk/Module_odk.mk |2 ++ 1 file changed, 2 insertions(+) New commits: commit 852cc47ab65bdddfb77eda594ab0b7aeabc5c5d7 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Feb 26 10:07:38 2013 +0100 Add comment about dependency gotcha Change-Id: Ia3eee9d4c06ef3411ad0a8547edcb08fe901d9dc diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index d2409ec..c66e1dd 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -33,6 +33,8 @@ $(eval $(call gb_Module_add_targets,odk,\ )) endif +# This apparently needs to come last, as the various CustomTarget_* add to +# odkcommon_ZIPLIST that is used here: $(eval $(call gb_Module_add_targets,odk,\ Zip_odkcommon \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
