odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent/cxx/Makefile |
2 +-
odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent/java/Makefile |
2 +-
odk/examples/DevelopersGuide/FirstSteps/FirstUnoContact/cxx/Makefile |
2 +-
odk/examples/DevelopersGuide/FirstSteps/FirstUnoContact/java/Makefile |
2 +-
odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape/java/Makefile |
2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 42edec63fba4a3ddc0dcd83a5affb7913625b42a
Author: Hossein <hoss...@libreoffice.org>
AuthorDate: Tue Nov 21 12:05:10 2023 +0100
Commit: Hossein <hoss...@libreoffice.org>
CommitDate: Tue Nov 21 13:31:36 2023 +0100
Cleanup make files for Java/C++ SDK examples
This fixes some minor issues with the make files for Java/C++ SDK
examples in DevelopersGuide/FirstSteps.
For Java examples, an exatra "-f Example_Java.mk" was a leftover from a
previous change.
For C++ examples, 'make clean' was not working correctly, because of a
leftover from a previous change.
Both should be fixed now.
Change-Id: Id936824675a9bfd43674ca526bc97a998ed9daf8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159777
Tested-by: Jenkins
Reviewed-by: Hossein <hoss...@libreoffice.org>
diff --git
a/odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent/cxx/Makefile
b/odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent/cxx/Makefile
index 20f6b34bd8c9..47df3bdc4fa5 100644
--- a/odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent/cxx/Makefile
+++ b/odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent/cxx/Makefile
@@ -97,4 +97,4 @@ clean :
-$(DELRECURSIVE) $(subst /,$(PS),$(OUT_APP_INC))
-$(DELRECURSIVE) $(subst /,$(PS),$(OUT_APP_GEN))
-$(DELRECURSIVE) $(subst /,$(PS),$(OUT_APP_OBJ))
- -$(DEL) $(subst \\,\,$(subst /,$(PS),$(OUT_BIN)/*SimpleBootstrap*))
+ -$(DEL) $(subst \\,\,$(subst /,$(PS),$(OUT_BIN)/*FirstLoadComponent*))
diff --git
a/odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent/java/Makefile
b/odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent/java/Makefile
index 94f2332ca066..091c9bcda3e0 100644
--- a/odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent/java/Makefile
+++ b/odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent/java/Makefile
@@ -81,7 +81,7 @@ $(EXAMPLE_NAME) : $(APP_JAR)
@echo
--------------------------------------------------------------------------------
@echo Please use the following command to execute the example!
@echo -
- @echo $(MAKE) -f Example_Java.mk $(APP_NAME).run
+ @echo $(MAKE) $(APP_NAME).run
@echo
--------------------------------------------------------------------------------
%.run: $(OUT_APP_CLASS)/%.jar
diff --git
a/odk/examples/DevelopersGuide/FirstSteps/FirstUnoContact/cxx/Makefile
b/odk/examples/DevelopersGuide/FirstSteps/FirstUnoContact/cxx/Makefile
index dca5fa92506b..a996044c602a 100644
--- a/odk/examples/DevelopersGuide/FirstSteps/FirstUnoContact/cxx/Makefile
+++ b/odk/examples/DevelopersGuide/FirstSteps/FirstUnoContact/cxx/Makefile
@@ -97,4 +97,4 @@ clean :
-$(DELRECURSIVE) $(subst /,$(PS),$(OUT_APP_INC))
-$(DELRECURSIVE) $(subst /,$(PS),$(OUT_APP_GEN))
-$(DELRECURSIVE) $(subst /,$(PS),$(OUT_APP_OBJ))
- -$(DEL) $(subst \\,\,$(subst /,$(PS),$(OUT_BIN)/*SimpleBootstrap*))
+ -$(DEL) $(subst \\,\,$(subst /,$(PS),$(OUT_BIN)/*FirstUnoContact*))
diff --git
a/odk/examples/DevelopersGuide/FirstSteps/FirstUnoContact/java/Makefile
b/odk/examples/DevelopersGuide/FirstSteps/FirstUnoContact/java/Makefile
index 4dca4468f74a..eae7d4452ffe 100644
--- a/odk/examples/DevelopersGuide/FirstSteps/FirstUnoContact/java/Makefile
+++ b/odk/examples/DevelopersGuide/FirstSteps/FirstUnoContact/java/Makefile
@@ -81,7 +81,7 @@ $(EXAMPLE_NAME) : $(APP_JAR)
@echo
--------------------------------------------------------------------------------
@echo Please use the following command to execute the example!
@echo -
- @echo $(MAKE) -f Example_Java.mk $(APP_NAME).run
+ @echo $(MAKE) $(APP_NAME).run
@echo
--------------------------------------------------------------------------------
%.run: $(OUT_APP_CLASS)/%.jar
diff --git
a/odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape/java/Makefile
b/odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape/java/Makefile
index a208b6eb6006..615e86bf3f25 100644
--- a/odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape/java/Makefile
+++ b/odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape/java/Makefile
@@ -81,7 +81,7 @@ $(EXAMPLE_NAME) : $(APP_JAR)
@echo
--------------------------------------------------------------------------------
@echo Please use the following command to execute the example!
@echo -
- @echo $(MAKE) -f Example_Java.mk $(APP_NAME).run
+ @echo $(MAKE) $(APP_NAME).run
@echo
--------------------------------------------------------------------------------
%.run: $(OUT_APP_CLASS)/%.jar
