odk/CustomTarget_build-examples.mk | 4 ++++
odk/CustomTarget_build-examples_java.mk | 5 ++++-
odk/build-examples_common.mk | 4 ----
3 files changed, 8 insertions(+), 5 deletions(-)
New commits:
commit fcba22ef7959d3bf0c7f3fc02434a120e3d8c075
Author: Rene Engelhard <r...@debian.org>
Date: Wed Apr 25 00:02:12 2018 +0200
move $(eval $(call gb_CustomTarget_CustomTarget back to build_examples*.mk
... since otherwise gbuild doesn't understand it and (e.g.) make odk.clean
fails
Change-Id: Ie6098bcf1ff99ee1a5df5fd5219d3b3c82075f71
diff --git a/odk/CustomTarget_build-examples.mk
b/odk/CustomTarget_build-examples.mk
index 69f7a2bd432f..d97fa0abf727 100644
--- a/odk/CustomTarget_build-examples.mk
+++ b/odk/CustomTarget_build-examples.mk
@@ -9,6 +9,8 @@
testname=odk/build-examples
+$(eval $(call gb_CustomTarget_CustomTarget,$(testname)))
+
my_example_dirs = \
CLI/CSharp/Spreadsheet \
CLI/VB.NET/WriterDemo \
@@ -31,6 +33,8 @@ my_example_dirs = \
# cpp/custompanel \
+.PHONY: $(call gb_CustomTarget_get_target,$(testname))
+
include $(SRCDIR)/odk/build-examples_common.mk
# vim: set noet sw=4 ts=4:
diff --git a/odk/CustomTarget_build-examples_java.mk
b/odk/CustomTarget_build-examples_java.mk
index 626443d7f23c..3fc4d6c40328 100644
--- a/odk/CustomTarget_build-examples_java.mk
+++ b/odk/CustomTarget_build-examples_java.mk
@@ -9,6 +9,8 @@
testname=odk/build-examples_java
+$(eval $(call gb_CustomTarget_CustomTarget,$(testname)))
+
my_example_dirs = \
DevelopersGuide/BasicAndDialogs/CreatingDialogs \
DevelopersGuide/Charts \
@@ -53,13 +55,14 @@ my_example_dirs = \
java/Text \
java/ToDo \
-
# java/ConverterServlet \
# java/EmbedDocument/Container1 \
# java/EmbedDocument/EmbeddedObject \
# java/NotesAccess \
# java/Storage \
+.PHONY: $(call gb_CustomTarget_get_target,$(testname))
+
include $(SRCDIR)/odk/build-examples_common.mk
# vim: set noet sw=4 ts=4:
diff --git a/odk/build-examples_common.mk b/odk/build-examples_common.mk
index 7459afd45b92..5847c3bc29a8 100644
--- a/odk/build-examples_common.mk
+++ b/odk/build-examples_common.mk
@@ -1,7 +1,3 @@
-$(eval $(call gb_CustomTarget_CustomTarget,$(testname)))
-
-.PHONY: $(call gb_CustomTarget_get_target,$(testname))
-
$(call gb_CustomTarget_get_target,$(testname)): \
$(call gb_CustomTarget_get_workdir,$(testname))/setsdkenv
ifneq ($(gb_SUPPRESS_TESTS),)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
