From 7bfee4f5465bcba5fa943abbe61453283b59cf15 Mon Sep 17 00:00:00 2001 From: Adam Knapp <adam.knapp@ericsson.com> Date: Fri, 9 Jul 2021 12:41:52 +0200 Subject: [PATCH] Splitting make clean command (issue #426) Signed-off-by: Adam Knapp <adam.knapp@ericsson.com> --- .../makefile/InternalMakefileGenerator.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/core/makefile/InternalMakefileGenerator.java b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/core/makefile/InternalMakefileGenerator.java index 5c580155ab..cae79c7841 100644 --- a/org.eclipse.titan.designer/src/org/eclipse/titan/designer/core/makefile/InternalMakefileGenerator.java +++ b/org.eclipse.titan.designer/src/org/eclipse/titan/designer/core/makefile/InternalMakefileGenerator.java @@ -78,7 +78,7 @@ import org.eclipse.titan.designer.properties.data.TTCN3PreprocessorOptionsData; * This class is used to generate the Makefile used by the build system of Titan. * * This variant of the Makefile generator is able to write the Makefile directly from eclipse, - * while having access to all eclipse resources and data from the on-he-fly analyzer. + * while having access to all eclipse resources and data from the on-the-fly analyzer. * * @author Kristof Szabados * @author Jeno Balasko @@ -2219,24 +2219,24 @@ public final class InternalMakefileGenerator { } contents.append("clean:\n"); - contents.append("\t-").append(rmCommand).append(" $(EXECUTABLE) $(OBJECTS) $(LIBRARY) $(GENERATED_HEADERS)"); - contents.append(" \\\n"); - contents.append("\t$(GENERATED_SOURCES) "); + contents.append("\t-").append(rmCommand).append(" $(EXECUTABLE) $(LIBRARY) $(OBJECTS)\n"); + contents.append("\t-").append(rmCommand).append(" $(GENERATED_HEADERS)\n"); + contents.append("\t-").append(rmCommand).append(" $(GENERATED_SOURCES)\n"); if (dynamicLinking) { - contents.append("$(SHARED_OBJECTS) "); + contents.append("\t-").append(rmCommand).append(" $(SHARED_OBJECTS)\n"); } if (preprocess) { - contents.append("$(PREPROCESSED_TTCN3_MODULES) "); + contents.append("\t-").append(rmCommand).append(" $(PREPROCESSED_TTCN3_MODULES)\n"); } - contents.append("compile"); + contents.append("\t-").append(rmCommand).append(" compile"); if (centralStorage) { contents.append(" compile-all"); } if (incrementalDependencyRefresh) { contents.append(" $(DEPFILES)"); } - contents.append(" \\\n"); - contents.append("\tbrowserdata.dat tags *.log"); + contents.append("\n"); + contents.append("\t-").append(rmCommand).append(" browserdata.dat tags *.log"); contents.append("\n\n"); contents.append("dep: $(GENERATED_SOURCES) $(USER_SOURCES)"); if (incrementalDependencyRefresh) { -- GitLab