diff --git a/Makefile b/Makefile index 0608ebc6ed..ac95cbde4b 100755 --- a/Makefile +++ b/Makefile @@ -74,7 +74,11 @@ help_usage: @echo test, test_all: Test OR-Tools for all available languages. @echo clean, clean_all: Clean output from previous build for all available languages \(won\'t clean third party\). @echo detect, detect_all: Show variables used to build OR-Tools for all available languages. - @echo "" +ifeq ($(SYSTEM),win) + @echo. +else + @echo +endif .PHONY: help_all help_all: help_usage help_third_party help_cc help_python help_java help_csharp help_fsharp diff --git a/makefiles/Makefile.cpp.mk b/makefiles/Makefile.cpp.mk index 8402c0226b..f81ade9f30 100755 --- a/makefiles/Makefile.cpp.mk +++ b/makefiles/Makefile.cpp.mk @@ -4,8 +4,10 @@ help_cc: @echo Use one of the following C++ targets: ifeq ($(SYSTEM),win) @tools\grep.exe "^.PHONY: .* #" $(CURDIR)/makefiles/Makefile.cpp.mk | tools\sed.exe "s/\.PHONY: \(.*\) # \(.*\)/\1\t\2/" + @echo. else @grep "^.PHONY: .* #" $(CURDIR)/makefiles/Makefile.cpp.mk | sed "s/\.PHONY: \(.*\) # \(.*\)/\1\t\2/" | expand -t20 + @echo endif .PHONY: ccc rcc clean_cc clean_compat ccexe diff --git a/makefiles/Makefile.csharp.mk b/makefiles/Makefile.csharp.mk index 2b60fe24b8..6495bf35a6 100755 --- a/makefiles/Makefile.csharp.mk +++ b/makefiles/Makefile.csharp.mk @@ -4,8 +4,10 @@ help_csharp: @echo Use one of the following C# targets: ifeq ($(SYSTEM),win) @tools\grep.exe "^.PHONY: .* #" $(CURDIR)/makefiles/Makefile.csharp.mk | tools\sed.exe "s/\.PHONY: \(.*\) # \(.*\)/\1\t\2/" + @echo. else @grep "^.PHONY: .* #" $(CURDIR)/makefiles/Makefile.csharp.mk | sed "s/\.PHONY: \(.*\) # \(.*\)/\1\t\2/" | expand -t20 + @echo endif # Check for required build tools diff --git a/makefiles/Makefile.fsharp.mk b/makefiles/Makefile.fsharp.mk index 7ae33c2d3a..e22b5fc8bd 100644 --- a/makefiles/Makefile.fsharp.mk +++ b/makefiles/Makefile.fsharp.mk @@ -4,8 +4,10 @@ help_fsharp: @echo Use one of the following F# targets: ifeq ($(SYSTEM),win) @tools\grep.exe "^.PHONY: .* #" $(CURDIR)/makefiles/Makefile.fsharp.mk | tools\sed.exe "s/\.PHONY: \(.*\) # \(.*\)/\1\t\2/" + @echo. else @grep "^.PHONY: .* #" $(CURDIR)/makefiles/Makefile.fsharp.mk | sed "s/\.PHONY: \(.*\) # \(.*\)/\1\t\2/" | expand -t20 + @echo endif BASE_ORTOOLS_DLL_NAME=Google.OrTools diff --git a/makefiles/Makefile.java.mk b/makefiles/Makefile.java.mk index b017ade5d1..af21ce31e1 100755 --- a/makefiles/Makefile.java.mk +++ b/makefiles/Makefile.java.mk @@ -4,8 +4,10 @@ help_java: @echo Use one of the following Java targets: ifeq ($(SYSTEM),win) @tools\grep.exe "^.PHONY: .* #" $(CURDIR)/makefiles/Makefile.java.mk | tools\sed.exe "s/\.PHONY: \(.*\) # \(.*\)/\1\t\2/" + @echo. else @grep "^.PHONY: .* #" $(CURDIR)/makefiles/Makefile.java.mk | sed "s/\.PHONY: \(.*\) # \(.*\)/\1\t\2/" | expand -t24 + @echo endif .PHONY: rjava cjava diff --git a/makefiles/Makefile.python.mk b/makefiles/Makefile.python.mk index 7086abd9ba..d4743b4f21 100755 --- a/makefiles/Makefile.python.mk +++ b/makefiles/Makefile.python.mk @@ -4,8 +4,10 @@ help_python: @echo Use one of the following Python targets: ifeq ($(SYSTEM),win) @tools\grep.exe "^.PHONY: .* #" $(CURDIR)/makefiles/Makefile.python.mk | tools\sed.exe "s/\.PHONY: \(.*\) # \(.*\)/\1\t\2/" + @echo. else @grep "^.PHONY: .* #" $(CURDIR)/makefiles/Makefile.python.mk | sed "s/\.PHONY: \(.*\) # \(.*\)/\1\t\2/" | expand -t24 + @echo endif OR_TOOLS_PYTHONPATH = $(OR_ROOT_FULL)$(CPSEP)$(OR_ROOT_FULL)$Sdependencies$Ssources$Sprotobuf-$(PROTOBUF_TAG)$Spython diff --git a/makefiles/Makefile.third_party.unix.mk b/makefiles/Makefile.third_party.unix.mk index 15e41c455a..746abca6e7 100644 --- a/makefiles/Makefile.third_party.unix.mk +++ b/makefiles/Makefile.third_party.unix.mk @@ -2,6 +2,7 @@ help_third_party: @echo Use one of the following Prerequisite targets: @grep "^.PHONY: .* #" $(CURDIR)/makefiles/Makefile.third_party.unix.mk | sed "s/\.PHONY: \(.*\) # \(.*\)/\1\t\2/" | expand -t20 + @echo # Tags of dependencies to checkout. GFLAGS_TAG = 2.2.1 diff --git a/makefiles/Makefile.third_party.win.mk b/makefiles/Makefile.third_party.win.mk index 8d4d7db520..068a71af6d 100644 --- a/makefiles/Makefile.third_party.win.mk +++ b/makefiles/Makefile.third_party.win.mk @@ -2,6 +2,7 @@ help_third_party: @echo Use one of the following Prerequisite targets: @tools\grep.exe "^.PHONY: .* #" $(CURDIR)/makefiles/Makefile.third_party.win.mk | tools\sed.exe "s/\.PHONY: \(.*\) # \(.*\)/\1\t\2/" + @echo. # tags of dependencies to checkout. GFLAGS_TAG = 2.2.1